Merge "Use buffered DataInputStream vs RandomAccessFile" into oc-dev am: b4a032fd02
am: 8a98e746ef

Change-Id: I93b9a3909dc385f29efc4b4447d3fa90b948fc1b