am 65bcc3ff: am 6c0454ec: Merge "add bt instrumentation to run as a util" into klp-modular-dev

* commit '65bcc3ff9212514a000ccdcc4d8295ddaedcef92':
  add bt instrumentation to run as a util