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

Change-Id: I3f19f615f5a042c4e041430fc94f3b3d918e6388