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

Change-Id: If3eb311a0e47ecf6aea426e6824637553a5d5443