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

Change-Id: If7f8abdcf50d7a9ca74b27bc7052308a429d00f6