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

Change-Id: I0f8384b13d0f9aa5cccedc18df13edc61b27baf8