Fix USB-OTG support

Change-Id: Id281f1a9da8c3944e78f2cd7829c4cda7ca935e6