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

Change-Id: If6df880b711f59f61162417f5301ce05cd91a8e2