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

Change-Id: I1e030fd54a5641bd125108686131f5f9be7a7d10