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

Change-Id: Ife9cf8d52e066a5575618b2e00eb7ed3c14c65ff