Merge "Adding unit test for UsbService anti-clobbering feature." into main