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

Change-Id: I52ccc1247a6a70fdffa2385af01d1175a97a4f8a