diff --git a/mobile/android/search/java/org/mozilla/search/SearchActivity.java b/mobile/android/search/java/org/mozilla/search/SearchActivity.java
index 06420e7f8f6..197ebfd99b2 100644
--- a/mobile/android/search/java/org/mozilla/search/SearchActivity.java
+++ b/mobile/android/search/java/org/mozilla/search/SearchActivity.java
@@ -4,12 +4,24 @@
 
 package org.mozilla.search;
 
+import org.mozilla.gecko.LocaleAware;
+import org.mozilla.gecko.Telemetry;
+import org.mozilla.gecko.TelemetryContract;
+import org.mozilla.gecko.db.BrowserContract.SearchHistory;
+import org.mozilla.gecko.health.BrowserHealthRecorder;
+import org.mozilla.search.autocomplete.SearchBar;
+import org.mozilla.search.autocomplete.SuggestionsFragment;
+import org.mozilla.search.providers.SearchEngine;
+import org.mozilla.search.providers.SearchEngineManager;
+import org.mozilla.search.providers.SearchEngineManager.SearchEngineCallback;
+
 import android.content.AsyncQueryHandler;
 import android.content.ContentValues;
 import android.content.Intent;
 import android.graphics.Rect;
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 import android.view.animation.AccelerateDecelerateInterpolator;
 import android.view.animation.Interpolator;
@@ -18,16 +30,6 @@ import com.nineoldandroids.animation.Animator;
 import com.nineoldandroids.animation.AnimatorSet;
 import com.nineoldandroids.animation.ObjectAnimator;
 
-import org.mozilla.gecko.LocaleAware;
-import org.mozilla.gecko.Telemetry;
-import org.mozilla.gecko.TelemetryContract;
-import org.mozilla.gecko.db.BrowserContract.SearchHistory;
-import org.mozilla.search.autocomplete.SearchBar;
-import org.mozilla.search.autocomplete.SuggestionsFragment;
-import org.mozilla.search.providers.SearchEngine;
-import org.mozilla.search.providers.SearchEngineManager;
-import org.mozilla.search.providers.SearchEngineManager.SearchEngineCallback;
-
 /**
  * The main entrance for the Android search intent.
  * <p/>
@@ -37,6 +39,8 @@ import org.mozilla.search.providers.SearchEngineManager.SearchEngineCallback;
 public class SearchActivity extends LocaleAware.LocaleAwareFragmentActivity
         implements AcceptsSearchQuery, SearchEngineCallback {
 
+    private static final String LOGTAG = "GeckoSearchActivity";
+
     private static final String KEY_SEARCH_STATE = "search_state";
     private static final String KEY_EDIT_STATE = "edit_state";
     private static final String KEY_QUERY = "query";
@@ -234,6 +238,14 @@ public class SearchActivity extends LocaleAware.LocaleAwareFragmentActivity
     public void onSearch(String query, SuggestionAnimation suggestionAnimation) {
         storeQuery(query);
 
+        try {
+            BrowserHealthRecorder.recordSearchDelayed("activity", engine.getIdentifier());
+        } catch (Exception e) {
+            // This should never happen: it'll only throw if the
+            // search location is wrong. But let's not tempt fate.
+            Log.w(LOGTAG, "Unable to record search.");
+        }
+
         startSearch(query);
 
         if (suggestionAnimation != null) {
diff --git a/mobile/android/search/java/org/mozilla/search/SearchWidget.java b/mobile/android/search/java/org/mozilla/search/SearchWidget.java
index ef19067e330..18da762ed85 100644
--- a/mobile/android/search/java/org/mozilla/search/SearchWidget.java
+++ b/mobile/android/search/java/org/mozilla/search/SearchWidget.java
@@ -18,10 +18,8 @@ import android.appwidget.AppWidgetProviderInfo;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.widget.RemoteViews;
-import android.util.Log;
 
 /* Provides a really simple widget with two buttons, one to launch Fennec
  * and one to launch the search activity. All intents are actually sent back