Merge changes from topic "app-image-flag"
am: e048f8bc39

Change-Id: I05727bf02752b9bf60be3a76be1046a590861580