flo: no need for usb otg cherry-pick anymore