Merge "Quit depending on SoftReference in UserHistoryDictionaryTests."