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

Change-Id: I792ee5ee0cee32573a5f7b7fd9977f23c84f556d