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

Change-Id: I36376348ccfd65f9ffcc2a0d9f941400f4668ae7