Merge "Adding FileSystemUtilsTests to presubmit" into main