Merge "Migrate helper functions from managerdefault to common"