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

Change-Id: Ida3a2e8cda75255cfc0432944cb207257ed834ef