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

Change-Id: If105dbfd4f22e8c8d1e37af3aac0285ea69c6474