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

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