Merge "Add TimeKeeperTest."