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

Change-Id: Iaa3df41768a54f4061f1061612414129dbbbe99f