Merge "Reduce file descriptor limit for 151-OpenFileLimit."
am: 089356baed

Change-Id: I5b6696aecba6da68f371eec8b6da944de0e5261f