[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 04e1eba886  -s ours
am: 817c845ded  -s ours

Change-Id: I5ffaa33b65ee5c6e7280752839d571c0ec7ffac3