Merge "Fix flaky FileInputStreamTest test."