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

Change-Id: I00c20f3b012a6f183b74f5836af62de9bae7a466