am 30001127: am 2bd619d5: Merge "Text changes to assist & voice input" into mnc-dev

* commit '30001127b22ef39e02155919adaa3906829c9688':
  Text changes to assist & voice input