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

Change-Id: I08397a31e8c22387ccdd271a2f3c9fb8f8bf22b3