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

Change-Id: Ie1233e834e8d62b97dddbdf3a36ca6fd92a0ce82