Merge "add missing annotation for CarrierIdentifier" am: fd46a0aaeb am: 26fa24bf4f
am: d5a7fd1ec2

Change-Id: Id5e9745d43184a8dce70775f1fe811e05688b6ef