Merge "Remove plug/unplug condition for the incompatible charging" into udc-dev