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

Change-Id: I211f81c9d1a6680e7270d0d2ccfc21bb24e95738