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

Change-Id: I93d2a6fe287491b957e2851de2ead9d878702e63