Merge "Fix usage of StringBuilder when getting parent path in PathUtils Making consta...