Merge "carrier id cleanup"