Merge "Refactor the buildTransitions into overridable functions" into udc-dev