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

Change-Id: Ia426c830457ab6bf7fdb19886c82d992abb0e61b