diff --git a/res/xml/time_zone_prefs.xml b/res/xml/time_zone_prefs.xml
index 598aa65f027..2199fae1cbf 100644
--- a/res/xml/time_zone_prefs.xml
+++ b/res/xml/time_zone_prefs.xml
@@ -16,6 +16,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="time_zone_settings_screen"
     android:title="@string/date_time_set_timezone">
 
@@ -29,7 +30,9 @@
             android:key="region_zone"
             android:title="@string/date_time_set_timezone_title"
             android:summary="@string/summary_placeholder" />
-        <com.android.settingslib.widget.FooterPreference/>
+        <com.android.settingslib.widget.FooterPreference
+            android:key="footer_preference"
+            settings:controller="com.android.settings.datetime.timezone.TimeZoneInfoPreferenceController" />
     </PreferenceCategory>
 
     <PreferenceCategory
@@ -37,6 +40,6 @@
         <com.android.settingslib.RestrictedPreference
             android:key="fixed_offset"
             android:title="@string/date_time_select_fixed_offset_time_zones"
-            android:summary="@string/summary_placeholder"/>
+            android:summary="@string/summary_placeholder" />
     </PreferenceCategory>
 </PreferenceScreen>
diff --git a/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java b/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java
index 0f0264f516c..71936f0d0c5 100644
--- a/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java
+++ b/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java
@@ -33,22 +33,18 @@ import com.android.settingslib.widget.FooterPreference;
 import java.util.Date;
 
 public class TimeZoneInfoPreferenceController extends BaseTimeZonePreferenceController {
-    private static final String PREFERENCE_KEY = FooterPreference.KEY_FOOTER;
 
+    private static final String PREFERENCE_KEY = FooterPreference.KEY_FOOTER;
+    @VisibleForTesting
+    Date mDate;
     private TimeZoneInfo mTimeZoneInfo;
     private final DateFormat mDateFormat;
-    private final Date mDate;
 
     public TimeZoneInfoPreferenceController(Context context) {
-        this(context, new Date());
-    }
-
-    @VisibleForTesting
-    TimeZoneInfoPreferenceController(Context context, Date date) {
         super(context, PREFERENCE_KEY);
         mDateFormat = DateFormat.getDateInstance(SimpleDateFormat.LONG);
         mDateFormat.setContext(DisplayContext.CAPITALIZATION_NONE);
-        mDate = date;
+        mDate = new Date();
     }
 
     @Override
diff --git a/src/com/android/settings/datetime/timezone/TimeZoneSettings.java b/src/com/android/settings/datetime/timezone/TimeZoneSettings.java
index 16976c256f4..edd1d256e05 100644
--- a/src/com/android/settings/datetime/timezone/TimeZoneSettings.java
+++ b/src/com/android/settings/datetime/timezone/TimeZoneSettings.java
@@ -102,15 +102,12 @@ public class TimeZoneSettings extends DashboardFragment {
         RegionZonePreferenceController regionZonePreferenceController =
                 new RegionZonePreferenceController(context);
         regionZonePreferenceController.setOnClickListener(this::onRegionZonePreferenceClicked);
-        TimeZoneInfoPreferenceController timeZoneInfoPreferenceController =
-                new TimeZoneInfoPreferenceController(context);
         FixedOffsetPreferenceController fixedOffsetPreferenceController =
                 new FixedOffsetPreferenceController(context);
         fixedOffsetPreferenceController.setOnClickListener(this::startFixedOffsetPicker);
 
         controllers.add(regionPreferenceController);
         controllers.add(regionZonePreferenceController);
-        controllers.add(timeZoneInfoPreferenceController);
         controllers.add(fixedOffsetPreferenceController);
         return controllers;
     }
diff --git a/tests/robotests/assets/grandfather_invalid_base_preference_controller_constructor b/tests/robotests/assets/grandfather_invalid_base_preference_controller_constructor
index bf2f29eade8..af67ad6766b 100644
--- a/tests/robotests/assets/grandfather_invalid_base_preference_controller_constructor
+++ b/tests/robotests/assets/grandfather_invalid_base_preference_controller_constructor
@@ -21,7 +21,6 @@ com.android.settings.bluetooth.BluetoothSwitchPreferenceController
 com.android.settings.connecteddevice.ConnectedDeviceGroupController
 com.android.settings.connecteddevice.SavedDeviceGroupController
 com.android.settings.datausage.DataUsageSummaryPreferenceController
-com.android.settings.datetime.timezone.TimeZoneInfoPreferenceController
 com.android.settings.fuelgauge.RestrictAppPreferenceController
 com.android.settings.fuelgauge.batterysaver.AutoBatterySeekBarPreferenceController
 com.android.settings.fuelgauge.batterysaver.BatterySaverButtonPreferenceController
diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceControllerTest.java
index 2a587704e42..3c36e04c99e 100644
--- a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceControllerTest.java
@@ -16,6 +16,9 @@
 
 package com.android.settings.datetime.timezone;
 
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.spy;
+
 import android.support.v7.preference.Preference;
 
 import com.android.settings.datetime.timezone.TimeZoneInfo.Formatter;
@@ -28,9 +31,6 @@ import org.robolectric.RuntimeEnvironment;
 import java.util.Date;
 import java.util.Locale;
 
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.spy;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 public class TimeZoneInfoPreferenceControllerTest {
 
@@ -41,12 +41,13 @@ public class TimeZoneInfoPreferenceControllerTest {
 
         TimeZoneInfo timeZoneInfo = formatter.format("America/Los_Angeles");
         TimeZoneInfoPreferenceController controller =
-                new TimeZoneInfoPreferenceController(RuntimeEnvironment.application, now);
+                new TimeZoneInfoPreferenceController(RuntimeEnvironment.application);
+        controller.mDate = now;
         controller.setTimeZoneInfo(timeZoneInfo);
         Preference preference = spy(new Preference(RuntimeEnvironment.application));
         controller.updateState(preference);
         assertEquals("Uses Pacific Time (GMT-08:00). "
-                + "Pacific Daylight Time starts on April 26, 1970.",
+                        + "Pacific Daylight Time starts on April 26, 1970.",
                 preference.getTitle().toString());
     }
 }
diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneSettingsTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneSettingsTest.java
index 21ca30d7464..725313e33f2 100644
--- a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneSettingsTest.java
@@ -16,6 +16,10 @@
 
 package com.android.settings.datetime.timezone;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 import com.android.settings.datetime.timezone.model.TimeZoneData;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
@@ -30,10 +34,6 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(shadows = {
                 SettingsShadowResources.class,
@@ -60,10 +60,9 @@ public class TimeZoneSettingsTest {
         TimeZoneSettings settings = new TimeZoneSettings();
         List<AbstractPreferenceController> controllers =
                 settings.createPreferenceControllers(RuntimeEnvironment.application);
-        assertThat(controllers).hasSize(4);
+        assertThat(controllers).hasSize(3);
         assertThat(controllers.get(0)).isInstanceOf(RegionPreferenceController.class);
         assertThat(controllers.get(1)).isInstanceOf(RegionZonePreferenceController.class);
-        assertThat(controllers.get(2)).isInstanceOf(TimeZoneInfoPreferenceController.class);
-        assertThat(controllers.get(3)).isInstanceOf(FixedOffsetPreferenceController.class);
+        assertThat(controllers.get(2)).isInstanceOf(FixedOffsetPreferenceController.class);
     }
 }