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

Change-Id: I15e4850919fde71321939a3d0523bfecf774caa1