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

Change-Id: I4ac77bce20c0afc07b87d2cedf5c56cb854fdb34