Merge "Re-enable MonotonicClockTest.corruptedFile()" into main