Merge "Use buffered DataInputStream vs RandomAccessFile" into oc-dev