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

Change-Id: Ifca36d73ae68ff988abddd10558ea5ca2ff5794b