Merge "Add flag for controling app image generation" into pi-dev
am: d08eab114a

Change-Id: Ic64829cf95147317129e4c5f4ef36f21fc75cda9