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

Change-Id: I9de1df3033f9e1502d37f70a7d260d8b44474e2f