am 1410db83: Merge "Check text length when testing for newline."

# Via Android (Google) Code Review (1) and Jeff Sharkey (1)
* commit '1410db83f97bf69a1a461cc20fd6d5b7b0ef08c0':
  Check text length when testing for newline.