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

Change-Id: Iaca2b9bb4253774e9d862cf2da3540a209d3dccc