Merge "rename precise carrier id to specific carrier id" am: 118354f77c
am: ab85849ce7

Change-Id: Icb53a9998d1f93852aadbee36a0f61322d8962b3