Merge "Fix some of the bluetooth warnings and unit test"