[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 0b86de2fb0  -s ours
am: 116c741141  -s ours

Change-Id: I20e39d121b18175dc8e6b56b5102c47c4349dd59