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

Change-Id: Ib969d0b34a977a0b9047c522429f2d5fa40db1f4