Merge "Update USB driver revision to 4."