Don't hard code the use of slashes as path separators. (cherry picked from commit ef30f6fe63)
ef30f6fe63