Merge "Fix for corruption when numFds or numInts is too large."