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

Change-Id: I75dc7f9b9e428ae5a5ceee0c58f0e8e538fb6c67