Merge "Increase the char limit of carrier_and_update_now_text to 34." into pi-dev