Merge "Replaced Bluetooth SystemProperties.set by sysprop"