am 15e35270: am 5e449276: am f2474d33: Merge "Implement better handling of text in assist." into mnc-dev

* commit '15e35270f220e4aa9695dc4d4d2bc88f0652cf2d':
  Implement better handling of text in assist.