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

* commit '6de1ba3377dd407e83f682edf9ae742416302772':
  Fixing crash in empty folders. (Bug 11627191)