[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 1b8781e72f  -s ours
am: 346fcae40a  -s ours

Change-Id: Ia9ee2b4864075b6c4ae1dc8ff504cc8bd951ce55