am 48ee473c: Merge "Clean up UserDictionaryCompatUtils"

* commit '48ee473c1e4d6eb1c76eeadce4a1fa3e101867a1':
  Clean up UserDictionaryCompatUtils