[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 2cab8e29cc  -s ours
am: 52a8ee416e  -s ours

Change-Id: Ia81cb714719e73319644e4cf92c7cfea419e9407