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

Change-Id: I81b7d1f6e9a5dac032060529b154894572279e5a