Merge "Handle EIO error in FUSE readdir" into mainline-prod