[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 939327ca4f  -s ours
am: 5ede75ec48  -s ours

Change-Id: I42f217a829a1803196bf8027797b19f19141a81e