Merge "Fix wipe from android settings for devices with /datadata" into ics