Merge "new carrier id API" am: 23a5549149
am: dfe1287d83

Change-Id: I71f60b060171c87271498f051d1cdff2e8e62721