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

Change-Id: I1b6437df865b949e8d0bc3d8c67fc178347b3943