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

Change-Id: I6a961eb2d6030eee2b1b8f5a88a382fe18b54e18