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

Change-Id: Idd3089e7691b47c8133db8953f441723b7468b11