Merge "Correct the naming of the variable" into udc-dev