Merge "fix carrier id parsing error"