diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index ca99998..6d36af7 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -88,6 +88,7 @@
 import com.android.inputmethod.latin.utils.IntentUtils;
 import com.android.inputmethod.latin.utils.JniUtils;
 import com.android.inputmethod.latin.utils.LeakGuardHandlerWrapper;
+import com.android.inputmethod.latin.utils.StatsUtils;
 import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
 import com.android.inputmethod.research.ResearchLogger;
 
@@ -509,6 +510,8 @@
         registerReceiver(mDictionaryDumpBroadcastReceiver, dictDumpFilter);
 
         DictionaryDecayBroadcastReciever.setUpIntervalAlarmForDictionaryDecaying(this);
+
+        StatsUtils.onCreateCompleted(this);
     }
 
     // Has to be package-visible for unit tests
@@ -628,6 +631,7 @@
         PersonalizationDictionarySessionRegistrar.close(this);
         LatinImeLogger.commit();
         LatinImeLogger.onDestroy();
+        StatsUtils.onDestroy();
         super.onDestroy();
     }
 
diff --git a/java/src/com/android/inputmethod/latin/utils/StatsUtils.java b/java/src/com/android/inputmethod/latin/utils/StatsUtils.java
new file mode 100644
index 0000000..f77406d
--- /dev/null
+++ b/java/src/com/android/inputmethod/latin/utils/StatsUtils.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.inputmethod.latin.utils;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import android.util.Log;
+
+import com.android.inputmethod.latin.settings.Settings;
+
+public final class StatsUtils {
+    private static final String TAG = StatsUtils.class.getSimpleName();
+    private static final StatsUtils sInstance = new StatsUtils();
+
+    public static void onCreateCompleted(final Context context) {
+        sInstance.onCreateCompletedInternal(context);
+    }
+
+    private void onCreateCompletedInternal(final Context context) {
+        mContext = context;
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mContext);
+        final Boolean usePersonalizedDict =
+                prefs.getBoolean(Settings.PREF_KEY_USE_PERSONALIZED_DICTS, true);
+        Log.d(TAG, "onCreateCompleted. context: " context.toString() + "usePersonalizedDict: "
+                + usePersonalizedDict);
+    }
+
+    public static void onDestroy() {
+        sInstance.onDestroyInternal();
+    }
+
+    private void onDestroyInternal() {
+        Log.d(TAG, "onDestroy. context: " + mContext.toString());
+        mContext = null;
+    }
+
+    private Context mContext;
+}
