Merge "Clean up class resolution and lookup." am: 2234a3882f
am: 4c4de09926

Change-Id: I765fed8bde41456e6d55014f93c139598c162ae7