[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 1771c08551  -s ours
am: 7e04ee020e  -s ours

Change-Id: I0525dfb1475d099a5313f5fc6e68e94b21593e17