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

Change-Id: I3862343b7083eb0fdb4a9bf3f00a54170d39923b