am d24f9397: Merge "Make shortcut-only user dict entry non-words."

* commit 'd24f93971292451c7a16456fecb8eff5deaa2c37':
  Make shortcut-only user dict entry non-words.