Merge "fix issues with precise carrier id"
am: 21c08a37cc

Change-Id: I7ceb4d5e6083f274d036413382f93bcd671c2953