Merge "Remove bd_addr from logcat"