Merge "Update the timestamp used for time zone filtering" am: 51376aefc1 am: d2b3df945c
am: 641ea6e4fa

Change-Id: I665c8d444e1eb58664e2884d371e21aae625f6fe