diff --git a/java/src/com/android/inputmethod/latin/ContactsDictionary.java b/java/src/com/android/inputmethod/latin/ContactsDictionary.java
index 83bc9046b..2f3395245 100644
--- a/java/src/com/android/inputmethod/latin/ContactsDictionary.java
+++ b/java/src/com/android/inputmethod/latin/ContactsDictionary.java
@@ -28,6 +28,12 @@ import android.util.Log;
 
 import com.android.inputmethod.keyboard.Keyboard;
 
+// TODO: This class is superseded by {@link ContactsBinaryDictionary}. Should be cleaned up.
+/**
+ * An expandable dictionary that stores the words from Contacts provider.
+ *
+ * @deprecated Use {@link ContactsBinaryDictionary}.
+ */
 public class ContactsDictionary extends ExpandableDictionary {
 
     private static final String[] PROJECTION = {
diff --git a/java/src/com/android/inputmethod/latin/UserDictionary.java b/java/src/com/android/inputmethod/latin/UserDictionary.java
index ea57db57c..81e2fdce4 100644
--- a/java/src/com/android/inputmethod/latin/UserDictionary.java
+++ b/java/src/com/android/inputmethod/latin/UserDictionary.java
@@ -29,10 +29,12 @@ import com.android.inputmethod.keyboard.ProximityInfo;
 
 import java.util.Arrays;
 
+// TODO: This class is superseded by {@link UserBinaryDictionary}. Should be cleaned up.
 /**
  * An expandable dictionary that stores the words in the user unigram dictionary.
- * To be deprecated: functionality being transferred to UserBinaryDictionary.
-*/
+ *
+ * @deprecated Use {@link UserBinaryDictionary}.
+ */
 public class UserDictionary extends ExpandableDictionary {
 
     // TODO: use Words.SHORTCUT when it's public in the SDK