Merge "Add unit tests covering USB data enable/disable scenarios" into main