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

Change-Id: I75ddbebe3adea3207706c82fbca77329e4939535