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

Change-Id: I019187584f69a88d4651049aef65bed2bfd8119e