Merge "Fix an issue in setting up PATH."