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

Change-Id: I77c52572c07644ff181c654d8f03a588cd8b7202