Merge "add bt instrumentation to run as a util" into klp-modular-dev