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

Change-Id: I530ea11b54c71662d1f56840f0aa523c8f3ace73