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

Change-Id: I0dd1273d9f685e49ed3712d043f0d0b8ae5d3e46