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

Change-Id: Icf8f25fe38065b373ea272f19ad633775c76013c