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

Change-Id: Ica9b06d6ec2ffc51b0deef9610adc6fa1cb867ae