Merge "Increase transitory state timeout to 10 sec." into udc-dev