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

* commit '5bc5d8a234794ad129817ba3b0b85a66638929ba':
  Fix flake around instrumentation.