Merge "Improve carrier id testability"