[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 72af45fd2b  -s ours am: ac27038f29  -s ours
am: d697cba5c2  -s ours

Change-Id: I4a186e58a8f97be521b6b4f16a796bedcca6f999