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

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