Merge change 2641

* changes:
  Framework changes for bluez4.