Merge "Revised Bluetooth discoverability string." into lmp-dev