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

Change-Id: I2883c2b2bf0fbbb8cec9d1312c7ad6430c78ad78