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

Change-Id: Ie491b015a05dd6c27f7341d4821051501904c1ed