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

Change-Id: I520898caa2065b26f4a18ec69db49b7ce2cbf67c