Merge "new carrier id version"
am: 9868df48ed

Change-Id: I673633cddefae67a6edb3de545444baa28a0b27f