am ff42294a: am 16f31d6f: Merge "Handle _ and % in paths" into jb-dev

* commit 'ff42294a2b050913c172b580a892a9e40aae24d2':
  Handle _ and % in paths