Merge "Fix for BluetoothAdapter.getAddress() when BT is off on some devices" into jb-mr1-dev