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

Change-Id: I3f003d28a2449afb5584120512f0272ce4d314c6