diff --git a/java/src/com/android/inputmethod/latin/LatinImeLogger.java b/java/src/com/android/inputmethod/latin/LatinImeLogger.java
index 2041acadf..cbac4d31c 100644
--- a/java/src/com/android/inputmethod/latin/LatinImeLogger.java
+++ b/java/src/com/android/inputmethod/latin/LatinImeLogger.java
@@ -79,7 +79,7 @@ public class LatinImeLogger implements SharedPreferences.OnSharedPreferenceChang
     public static void onPrintAllUsabilityStudyLogs() {
     }
 
-    public static boolean isResearcherPackage() {
+    public static boolean isResearcherPackage(Context context) {
         return false;
     }
 }
diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java
index 87ac464f8..5af21452a 100644
--- a/java/src/com/android/inputmethod/latin/Settings.java
+++ b/java/src/com/android/inputmethod/latin/Settings.java
@@ -237,8 +237,7 @@ public class Settings extends InputMethodSettingsActivity
             textCorrectionGroup.removePreference(dictionaryLink);
         }
 
-        // TODO: Following isResearcherPackage can be wrong until LatinImeLogger gets initialized.
-        final boolean isResearcherPackage = LatinImeLogger.isResearcherPackage();
+        final boolean isResearcherPackage = LatinImeLogger.isResearcherPackage(this);
         final boolean showUsabilityStudyModeOption =
                 res.getBoolean(R.bool.config_enable_usability_study_mode_option)
                         || isResearcherPackage || ENABLE_EXPERIMENTAL_SETTINGS;