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

Change-Id: I462aa825e53c814fadc6f260b4d4b53cc91e3698