Merge "BuildDataUserCePath always use dir instead of symbolic link"