Merge "Fix remote wipe with mobile sync server"