Merge "Revert "Remove CSIP/VCP enable/disable from Setting"" into udc-dev