API review: rename CarrierIdentification to CarrierId
am: 992e6b67f1  -s ours

Change-Id: I97116db978f2afa02e3ceee09ab2ae3f8c3a2516