Update char limit and context for a string
am: 2fca910eab

Change-Id: I0a75ed33f988c4cc4bc33ca653841fbae97d7e78