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

Change-Id: Ibd86ea891ddda230b06138cb4adf23d16f2e1f03