Merge \"Solve the infinite loop on clearExternalStorageDataSync\" into nyc-dev
am: d25c718a12

Change-Id: Ib7f8efc9d74143cedd7ad06aaec7693ca01ae2e7