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

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