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

Change-Id: Ibf0c0b2e1bedf25f8228e98bdb3644d0e090d135