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

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