[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 83be07a49f  -s ours
am: 68d887e8e5  -s ours

Change-Id: Ie5b9c4fc603473d71743924cce40613b715b64e2