Merge "Move utility classes in a separate static target"