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

Change-Id: I660daedefcc84c1a972128b23459f55387109269