[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 60eae91c05  -s ours am: 919a01c0f6  -s ours
am: 0666bd52c6  -s ours

Change-Id: I5b12d5d7ac9687a806511c617a09201ede68b8e2