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

Change-Id: Ib51de709b08e3f48e9a80fc0d82a3c8a184b045d