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

Change-Id: I33f0161bc965e613ad062463338ba6ddc8f29e5b