Merge "new carrier id APIs"