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

Change-Id: Ib33a1d6cad10bdb1bffe3113d1a62d5808de8761