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

Change-Id: I06802aefdd83ca789c4ec03224bb10b417a57dc9