[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 8b16aba0dd  -s ours
am: 27e14db009  -s ours

Change-Id: Ic2e8292d1f5936b943ba084611456fcf19651004