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

Change-Id: Ic6cd7419e18b26c827a2d643975e15b29a93c597