Merge "Increase char limit for string." into nyc-mr1-dev am: 971c42180b
am: c47ad5972d

Change-Id: Iae6f292ae1c4d054d792402bcb4452395f83e317