Merge "Logging: Bluetooth Enabled" am: 8173db40c3
am: 02a75203a0

Change-Id: I72a3a8dc70d9baa18d93aa62d94b3c3b7fac4c76