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

Change-Id: Ie52ab7b10b669d5f7268dab664f71a3a6c1fe3ba