Merge "Usb non-compliant port partner frameworks api"