Merge "Move util classes under common"