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

Change-Id: I9c1eb03c6f403cd361cdb314dc7dea6e09950696