Merge "Replace RandomAccessFile with BufferedInputStream"