Merge "Sync main.confs with that of Bluez"