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

Change-Id: Ic31625e5eab080bdb007d85803b2f9eebe430dbf