Merge "Updated string char-limits to better match available space for data usage." into pi-dev am: 0454317643
am: ebfe3a9fd6

Change-Id: I3408888a7d0e89aec88658e4ad0742b3011906c9