[automerger skipped] Merge "Add dedicated flag to control app image generation" am: abf1476dbe
am: 21a2f48a0d  -s ours

Change-Id: Ia9dee120bc2f79e1705064e43de6736fa1b57d48