Merge \"Don\'t show times before 2000-01-01\" into nyc-mr1-dev
am: 4786f6d958

Change-Id: Ic0eb9edf0cc94f62d808e214e19c8003dc9a7941