Merge "Increase char limit for new strings." into rvc-dev am: 9b85a57dd3 am: 00fbbb299a

Change-Id: Ib922464ba0c22dc9bd59fc243c04324a15e77cd9