Merge CM Bluetooth Changes

Change-Id: Ieb73d7603cb22d2647b07ad617fe8a39b0d6e9be