[automerger skipped] Merge "Blacklist 596-app-image." into pi-dev
am: 40b799050a  -s ours

Change-Id: I40f8c292d6c988bf9e6fe5bb9c0ad843abe86ad9