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

Change-Id: I46340a944a9ded60d432a653d18721455cfcc888