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

Change-Id: I1dfa156bf84dcf0f286b13d76953918d19842c47