Merge "Rewrite Class init entrypoint to take a Class arg."
am: b27d874ebc

Change-Id: Ie6a02f04492cbb0b0567dd67e1b80a4b6e4e20d9