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

Change-Id: I56159711b0e3b7c2d5795d93313bbedfcf3d6363