Merge "API review: rename CarrierIdentification to CarrierId"