Merge "fix issue that carrier id returns zero" am: 20d34663dd am: 2f02fc4839
am: 33f0630deb

Change-Id: I3927b07e095cdfc32a7fcb5c852242981a5bd339