Merge "Create an interface for NPVC" into udc-dev