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

Change-Id: Id66e45a67aee36295daa031eae4f92906a615b62