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

* commit '6c0454ecae4fe46b7032299d02fc6da80f171ed2':
  add bt instrumentation to run as a util