Merge "Ignore if the dir we are trying remove doesn't exist."