[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 5bb50d0544  -s ours am: 2510f783b0  -s ours
am: ed1b790f92  -s ours

Change-Id: I9636cdc531f4598605be9a6f017fad12c11f1339