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

Change-Id: Ie000deb84f00268c93579bcb32a76e436ab94ed7