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

* commit '6a99ff0adfa8949cce11cd47142a3d550421904e':
  sdcard: Properly handle deleted nodes