Merge "new carrier id version" am: 9868df48ed
am: b105cc71a7

Change-Id: Ia4ade2ccce61b3d63a8af89f456de5ff8d7d7150