Merge "add missing annotation for CarrierIdentifier"
am: fd46a0aaeb

Change-Id: Ifbee0be758972174191967de245523e003790fb1