Merge "Move util classes to common package." into main