Merge "Make sure no handlers have id = 0" into udc-dev