Upgrade bluez5_37 :Merge the code from private