Merge "Check for temporary and retired classes in GetClassFields." am: d449cc10a1
am: 0d5cd1e98a

Change-Id: I81ef73ce459ee595e58ed470abfd8de8202170be