Merge change 8742

* changes:
  Modify BluetoothPbap for a few wrong wordings