Merge "apply new carrier id APIs"