Merge "update carrier id list to version 5"