Merge "Update bad calibration error message" into udc-dev