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

Change-Id: I855588f2d594fea55a2583fbd8e60166f9b992c8