Merge "Enable time zone preference on wifi-only device."