Merge "Optimize FetchAndCacheResolvedClassesAndMethods" am: cd0b9eed22
am: 2746f26889

Change-Id: Icf848cbbaa99fa250b8a6ad185657b95646bf6b7