Merge "Add function CleanupOldScratchFiles symmetrically"