[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 43236df369  -s ours
am: 6a0bb6d545  -s ours

Change-Id: If73619ab91919606c374dd00e674e5ccfb67bfd4