Merge \\\"Solve the infinite loop on clearExternalStorageDataSync\\\" am: 9a3fbe1162 am: 2747eb7e94
am: 8fbc6c9005

Change-Id: I6136a70985b1594a7374afa50a62235765f8f236