Merge "Fix flake around instrumentation."
am: 55a77ef5f9

* commit '55a77ef5f99c2b056eb5f2820c1ff3b29c0ec270':
  Fix flake around instrumentation.