Merge "[USB] Update exception handling code"