am 4a75e3c2: am ba9ef537: Merge "Support multiple instrumentation clients"

* commit '4a75e3c22ccd4680ff0416c1609dafad1130ede8':
  Support multiple instrumentation clients