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

* commit '653e7d770a1f8c5ef710276997babd09c483bb48':
  Fix flake around instrumentation.