diff --git a/java/src/com/android/inputmethod/latin/DictionaryFacilitator.java b/java/src/com/android/inputmethod/latin/DictionaryFacilitator.java
index f154342..a451b67 100644
--- a/java/src/com/android/inputmethod/latin/DictionaryFacilitator.java
+++ b/java/src/com/android/inputmethod/latin/DictionaryFacilitator.java
@@ -171,4 +171,10 @@
     void dumpDictionaryForDebug(final String dictName);
 
     ArrayList<Pair<String, DictionaryStats>> getStatsOfEnabledSubDicts();
+
+    void addOrIncrementTerm(String fileName,
+            String finalWordToBeAdded,
+            NgramContext ngramContext,
+            int increment,
+            int timeStampInSeconds);
 }
diff --git a/java/src/com/android/inputmethod/latin/DictionaryFacilitatorImpl.java b/java/src/com/android/inputmethod/latin/DictionaryFacilitatorImpl.java
index 48fe73b..4ed9405 100644
--- a/java/src/com/android/inputmethod/latin/DictionaryFacilitatorImpl.java
+++ b/java/src/com/android/inputmethod/latin/DictionaryFacilitatorImpl.java
@@ -746,10 +746,12 @@
         return maxFreq;
     }
 
+    @Override
     public int getFrequency(final String word) {
         return getFrequencyInternal(word, false /* isGettingMaxFrequencyOfExactMatches */);
     }
 
+    @Override
     public int getMaxFrequencyOfExactMatches(final String word) {
         return getFrequencyInternal(word, true /* isGettingMaxFrequencyOfExactMatches */);
     }
@@ -793,4 +795,13 @@
         }
         return statsOfEnabledSubDicts;
     }
+
+    @Override
+    public void addOrIncrementTerm(String fileName,
+            String word,
+            NgramContext ngramContext,
+            int increment,
+            int timeStampInSeconds) {
+        // Do nothing.
+    }
 }
diff --git a/java/src/com/android/inputmethod/latin/NgramContext.java b/java/src/com/android/inputmethod/latin/NgramContext.java
index 86155e0..53bec6e 100644
--- a/java/src/com/android/inputmethod/latin/NgramContext.java
+++ b/java/src/com/android/inputmethod/latin/NgramContext.java
@@ -108,7 +108,9 @@
         mPrevWordsCount = prevWordsInfo.length;
     }
 
-    // Create next prevWordsInfo using current prevWordsInfo.
+    /**
+     * Create next prevWordsInfo using current prevWordsInfo.
+     */
     @Nonnull
     public NgramContext getNextNgramContext(final WordInfo wordInfo) {
         final int nextPrevWordCount = Math.min(
