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

Change-Id: I5cfb3374a162863adc305f041eaca08d6efa2d3e