am 054b29e1: am ef38670c: Merge "Ensure classes are initialized rather than initializing."

* commit '054b29e178dd21b546201be17c96266d240c791f':
  Ensure classes are initialized rather than initializing.