Merge "Fix bug in getting enabled providers" into udc-dev