Merge "Gen Type and Generated TO builders moved to Util project."