Merge "Correct typo in BluetoothSap binder" into nyc-mr1-dev