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

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