Merge "Fix ExternalStorageProvider always throw exception when rename" am: 8883851c71
am: deb51d8489

Change-Id: I4411270b371f25d7a245f163db8d1a358426b6f2