Merge "fixed parsing issue in BluetoothService so that it parses the UUID property correctly" into gingerbread