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

Change-Id: Ief5a921963db6e3fb72bfb1a008802be4a99aab6