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

Change-Id: I1d7a3f3be5cf57d95a622b3593a9bc0bf389a7f7