Merge "Optimize FetchAndCacheResolvedClassesAndMethods"
am: cd0b9eed22

Change-Id: I2806cc686c2df76cf48a46392092094a8a6c4877