Merge "Increase the char limit of carrier_and_update_now_text to 34." into pi-dev
am: 6eb1d9ed90

Change-Id: I0451cda170f6e286dda1213ebaec3bc846e49022