Merge "Add feature flag for loading app image startup cache"
am: 3b241361b6

Change-Id: I6fb8e3b123656d176f4c9bc128d641bb9de5a762