Merge "Replace incomplete path-based check with statx"