am c44314b4: am dc38a343: Merge "Use a freq of 1 instead of 0 for non-word shortcuts." into jb-mr1-dev

* commit 'c44314b40464366814179c5a5952a66ef65d9831':
  Use a freq of 1 instead of 0 for non-word shortcuts.