Merge "USB owners cleanup"