Merge "Increase timer test tolerance." into udc-dev