am bca4dcdc: (-s ours) am ad3e50e2: am 886784f0: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit 'bca4dcdcb36ebc7f33556b329e3eb30955f3a771':
  DO NOT MERGE: Clear cache of the user dictionary when a word is added