Merge "Remove simulator conditionals."