BT: bt mngmnt rework

Change-Id: I8486dd7370067dec5a2ea3b8395eacfbedc06d41