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

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