[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: fab70a4591  -s ours
am: 5705b1b004  -s ours

Change-Id: I5921b1849493d2ab62dc1c886fb3f67bda7f5dd8