Merge "API review: rename CarrierIdentification to Carrier id" into pi-dev