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

Change-Id: I3790a9aeb8899a28ec5dfe0bcb95eb69ee0e8604