am d65fb393: Merge "Revert "Fixing crash in empty folders. (Bug 11627191)"" into jb-ub-now-jolly-elf

* commit 'd65fb393595cb093936c7d5d0d54b0511430aa9d':
  Revert "Fixing crash in empty folders. (Bug 11627191)"