Merge "Remove toString() for CarrierIdentifier." into pi-dev