[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 5e7be53596  -s ours
am: 53349cc448  -s ours

Change-Id: Ibe0b79a1db684f0b13336a0b9d6cd955046e21c1