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

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