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

Change-Id: I8be8bcca9f258cce95a9ec390f281034dc5f4fd7