Merge "Changes to Bluetooth Service structure."