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

Change-Id: I2eef0c55c4e767c8429d81355014aedac5f9f534