Merge "add missing annotation for CarrierIdentifier"