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

* commit '564cfbdef48fccb6e26b164aa670f73aeffa05d9':