[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
am: 3ff9892780  -s ours

Change-Id: I68eb103e1ed358c453f3a5741252bcbd3a1ddc22