Merge "Fix flakey MCR test in RevisionDbTestBase by mocking the time"