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

Change-Id: I9864c5f64af07ffd1b959c483e4ae96474101a04