[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
am: 65bd2769c0  -s ours

Change-Id: I89aac69cbda6030daa1600fe5fdae25793ea43ff