[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 8a7b69889c  -s ours
am: 277ae9957c  -s ours

Change-Id: I54c11930e5c89999c0d1b198e4eb8d5d0c367a2c