Merge "Fix FileInputStreamTest"