Merge "new CarrierIdProvider for carrier resolution"
am: 86a800ae43

Change-Id: Ie7f22af82835f164e02fefa3aa6a60023c9ff077