Merge "Clean up UserDictionaryCompatUtils"