Merge "Add bt traffic accounting"