am: d5e665a2 * commit 'd5e665a2': ART: Slightly change InitializeClass flow Change-Id: I7cff06f2849b705a51d72c76ce8dbdda4080128a