[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 2f4a5d7c42  -s ours
am: 7a2b55c047  -s ours

Change-Id: I1fdd9586d3d60cdb0882b98f684a74018b953f50