am 3b4cd1ff: am 0a11d90f: am 0a793bd9: Properly filter paths to locate device directories

* commit '3b4cd1ff758adaf233c823b229599f0e9ec7c21e':
  Properly filter paths to locate device directories