Merge "Fixed wipeData() so it doesn't depend on device_admin." into sc-dev