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

Change-Id: I5f8d01d3d21227975f26286dcd1508567c48c4a0