Merge "CarrierIdProvider improvements" am: 864d22ac5d
am: ed7c9f45be

Change-Id: I24ca44d0d31f55b30ed8016966bdde91284512b8