Deal with long words

Bug: 60387
Change-Id: Ifbed07fa58600d61d126df90a8e3492f7711c19e