Merge change 7372

* changes:
  Register OPUSH - Bluetooth OPP service record.