Merge "Increase char limit for string." into nyc-mr1-dev
am: 971c42180b

Change-Id: I54a8bddd2b773ab44f8036059acc91a9934bf9ee