Merge change 23462 into eclair

* changes:
  Add Bluetooth Device trust