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

Change-Id: I6ca9337b2c4c8aa94cda245c7e346e44ec900167