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

Change-Id: I920c8ebde3b4697702c2ef9b2d9781ce901ecc86