Merge "remove system/bluetooth dependency"