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

Change-Id: I4d2de75930515787704d5a257fc2c3354a08bd11