Bug 843452 - Part y-2: Bluetooth changes