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

* commit '5e44927699026fed2fbf8cbd9ee1202bb0f80c07':
  Implement better handling of text in assist.