Merge change 25354 into eclair

* changes:
  Fix string name for bluetooth pairing and fix NPE