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

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