Merge "Increase string char limits" into rvc-dev am: 6745b6c78b am: 28a1993a29 am: 181cdec4be

Change-Id: I5b5dd300202bbd43a7d17a69bbf5a62aef455cf2