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

Change-Id: I60f8f9182ff0b2eb69dcd1e4029801efbc6f2d76