Merge "Improve error message in 151-OpenFileLimit."