Merge "Clean up class preloading" am: 4082bc010b
am: 5b2da73fa3

Change-Id: Ia1083bfc351ed2f93ae3bda4724d35f806f98d59