Merge "Enable Bluetooth by default" into nyc-mr1-dev
am: 07a015e249

Change-Id: Ib745fd0fe33e0d2366aa0861a702fb51425c4a11