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

Change-Id: I63d429e157b50eca510fce3c5b16baa1b5d656c2