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

Change-Id: I4ef295e377282c7a38dbce44fca0e92395fa5395