Merge "API review: rename CarrierIdentification to CarrierId" am: a5e5eda3c9
am: 13930a9302

Change-Id: I86a3ca14b209fcba4e927d355c8a43ca04520e97