Merge "Fix a flake with mocking."