Merge "fix issue that carrier id returns zero"
am: 20d34663dd

Change-Id: I937d35687efbb29086d86f31139338bc2f47235e