am 385f4478: am 4b08e074: Merge "Quick reject empty paths" into jb-mr1-dev

* commit '385f4478a2eef0a93873eae9a846dd7712e5cabd':
  Quick reject empty paths