Merge "Use normalize-path-list"