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

Change-Id: Ie02b451487a2b22cbdede3ca208e9145a3821b89