ART: Encapsulate init-optimization fields
am: 07a560d98c

Change-Id: I26bf753747e5f54d549665db00c03ffd0a9d39fd