Make classes visibly initialized faster. am: 9f18fbc433
am: 770147ab28

Change-Id: I6c5dc3aee147c7f81a8123bf035c72dc41c2e1dd