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

Change-Id: I08a9fdc0f8e5ef6f101ba5d247defc38c4659719