[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 44a5e5f768  -s ours am: f147c929c1  -s ours
am: 36b3bdd3fc  -s ours

Change-Id: Ibcaf48cf74f3aca2e62bb3ff8fc38a066a01bd57