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

Change-Id: Ideb789f6d67fcfa02886ce845eb7daa4866d82f5