am e66fa5c1: am 251de854: am 53e9bfae: Merge "Fix error checking in MemoryFile."

* commit 'e66fa5c1851f48dce95364dc0acbde1b9f39f160':
  Fix error checking in MemoryFile.