Merge changes from topic "bluetooth_oob_api"

* changes:
  Fix CTS Failure
  Bluetooth: Modify and append to the Out-of-Band API