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

* commit '88936b7f82a6ec4023078e62304425147da4b56e':
  Implement better handling of text in assist.