Merge "rename precise carrier id to specific carrier id" am: a414d11f3d
am: 7076333baa

Change-Id: Ic08ad204f2bfa3bc0468ff81102440372905f763