Merge "Changes for new Bluetooth APIs."