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