Merge "Enable Bluetooth by default" into nyc-mr1-dev