Merge "Fix flake around instrumentation."