Merge "API review: rename CarrierIdentification to CarrierId"
am: a5e5eda3c9

Change-Id: Id1f14e2bdc3a66d49bf1318e2ebf462be8d1f507