Merge "Fix Robolectric Bluetooth tests"