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

Change-Id: Iec5195ffd965598701103dd5632f46d2e5ff78fb