Merge "Changed SafeCleaner to use ThrowingRunnable"