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

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