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

Change-Id: I0be752cc63cf48b89faa94ce822374ac40a70f97