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

* commit 'd367191c05d2f61ea836342f62dadc5745de27fc':
  Support multiple instrumentation clients