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

Change-Id: I8c0795592ebc008a63cdef02194c76c19be9fb53