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

Change-Id: Icce93f7ab9f9631ad2e65e6e959f947c816e787e