Merge "Clean up class preloading" am: 4082bc010b am: 5b2da73fa3 am: 8a3781df49 am: 47313fedf1
am: 4d7a214df6

Change-Id: I7411cf45dafe63525df871ba7052aa1540a4d951