Merge "Add dedicated flag to control app image generation" into pi-dev
am: 7ee86d1dbc

Change-Id: Ia6b87f484bfeb13d358b6283ad319d1d4aeba60c