Merge pull request #4607 from koying/fixdroidstoragecrash