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

Change-Id: I56e12f9609c5b511c65a6e6b32dbc7ab1d80958a