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

Change-Id: Ifa3f9321334f3edf3a0fb41ca5caef2f3ec4cd34