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

Change-Id: I4eba1060e190e700e7afaf0fefcdcfba29e6ac7f