Merge "rename precise carrier id to speicific carrier id" am: efcbbc33c9
am: 13923eb5a5

Change-Id: Idb83dfabc66a9b316559ff11f4fa49b82d704b0f