Merge "Revert "Revert "Logging: Bluetooth Enabled""" am: 827a150646
am: 428e05ac6c

Change-Id: I54932a1b45870a75450a605584f09b797a9f2298