Merge "Merge "Increase string char limits" into rvc-dev am: 6745b6c78b am: 28a1993a29 am: 181cdec4be am: 20934d7d5c" into rvc-qpr-dev-plus-aosp