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

Change-Id: I7fdb7e00097b97bced26889e70999b8de196bdcd