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

Change-Id: Iffa3a5c6bf25085340dd5823704c70fadf172eee