Merge "Fix setAllowedCarrier"