[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 9b472034fe  -s ours
am: 82a731feb5  -s ours

Change-Id: I57a7b510e1e45a41e8cb77537057198b026e861c