am 8d49c8b0: am f66486ef: Merge "Fix incorrect path name check."

* commit '8d49c8b0bfdc7bed855acec603bacc355b5bcb8c':
  Fix incorrect path name check.