[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 5aa42775fe  -s ours
am: 8ec5457546  -s ours

Change-Id: I1340c29bc012aab1639429d2061c659e9ce4fbe5