Merge \\"Correct typo in BluetoothSap binder\\" into nyc-mr1-dev am: 0db08ca3e7
am: 2380af193e

Change-Id: I2e99a9b8a408abe4eba6c66f5354b0411b69f2cf