Merge "Add use_app_image_startup_cache feature flag" am: b5a69ab764
am: b2f6041624

Change-Id: Ic4f04f06056c5e1036345373118a00eccd2a4497