Merge "new CarrierIdProvider for carrier resolution" am: 86a800ae43 am: ffe7643ec6
am: b42204a9ca  -s ours

Change-Id: I7f8a3657d455378b9076f25453998854b812c963