[automerger skipped]Merge "Logging: Bluetooth Enabled" into pi-dev am: 294ad78534  -s ours
am: d6f48d9f9f  -s ours

Change-Id: Ib959c707cd4207aca4cb1c843a85def1b77a7247