Merge "Solve the infinite loop on clearExternalStorageDataSync" into nyc-dev