Merge "Fixed tests based on return value of PIN length" into udc-dev