Merge "Increase string char limits" into rvc-dev am: 6745b6c78b

Change-Id: I49894c5dc83a479ff0d47c47cdeaf9745836153c