Merge "Increase the char limit of carrier_and_update_text to 32." into pi-dev