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

Change-Id: I45ea1036c2e8b48f268b64a1ba8a12dd7d7b8bfa