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

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