Merge "Remove unused dependency to config module"