Merge "Add use_app_image_startup_cache feature flag"
am: b5a69ab764

Change-Id: I26ab26b34445d0be649a45f735d4860036c7d1f3