Merge "ART: Slightly change InitializeClass flow"