Merge "Add updates for the BT route for the UI."
am: e3c69d3148

Change-Id: I0a47bd13f5fcc2e8e563d76eb7b18e786b9c3953