[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 6d7c974846  -s ours
am: 21a634824e  -s ours

Change-Id: I1fa984b05d43c196d998ecbdab8668a6b001dc3f