Merge "diag: Add protection while accessing usb_info's buffer table"