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

Change-Id: Ie98527a95b2ef0f918790dd1440883509e1bbb0b