am 8582264d: am 766c95be: am e66fa5c1: am 251de854: am 53e9bfae: Merge "Fix error checking in MemoryFile."

* commit '8582264dbf84aabe18adb113807c1ae8b563b88f':
  Fix error checking in MemoryFile.