Merge "Update Bluetooth codec related strings" into pi-dev