Merge "Ensure GetLoadedClasses only returns 'Loaded' Classes." am: a08c9bbe02
am: 866042a49e

Change-Id: I57742969b41a35c78636f39767395bae20121a56