Merge "Replace and remove unmetered carrier configs"