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

Change-Id: Icc335ae31811a75ed84551b26f9c8c01a983fa0b