Merge "fix issue that carrier id returns zero"