[automerger skipped] Merge changes from topic "app-image-flag" am: e048f8bc39 am: 965a1eea8f  -s ours
am: 9d91790358  -s ours

Change-Id: I57297b57973e0c5413ddd0096dcb36a18c9be4f5