am 3a4aedfc: Merge "sdcard: Properly handle deleted nodes"

* commit '3a4aedfcd3354b903aa48a836cb55ee01db9f896':
  sdcard: Properly handle deleted nodes