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

Change-Id: I925808dc2e79b928692833b22d6d8667cff748dc