diff --git a/core/java/android/preference/PreferenceFragment.java b/core/java/android/preference/PreferenceFragment.java
index 325b2e66599ab..ff16f6cf132c4 100644
--- a/core/java/android/preference/PreferenceFragment.java
+++ b/core/java/android/preference/PreferenceFragment.java
@@ -329,6 +329,11 @@ public abstract class PreferenceFragment extends Fragment implements
         if (preferenceScreen != null) {
             preferenceScreen.bind(getListView());
         }
+        onBindPreferences();
+    }
+
+    /** @hide */
+    protected void onBindPreferences() {
     }
 
     /** @hide */
diff --git a/core/java/android/preference/PreferenceGroupAdapter.java b/core/java/android/preference/PreferenceGroupAdapter.java
index 9b41ff03d2546..381a5f0945377 100644
--- a/core/java/android/preference/PreferenceGroupAdapter.java
+++ b/core/java/android/preference/PreferenceGroupAdapter.java
@@ -20,7 +20,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.Handler;
 import android.preference.Preference.OnPreferenceChangeInternalListener;
@@ -243,6 +242,7 @@ public class PreferenceGroupAdapter extends BaseAdapter
         if (position == mHighlightedPosition && mHighlightedDrawable != null) {
             result.setBackgroundDrawable(mHighlightedDrawable);
         }
+        result.setTag(preference.getKey());
         return result;
     }