Merge "Add dedicated flag to control app image generation"
am: abf1476dbe

Change-Id: If1047435f3b74443e2508a265500acf4ed1c7b53