[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: c89a3971e9  -s ours
am: edc23ced8a  -s ours

Change-Id: I6a778fc608ee9e5dac9607dd769b34b96961ff85