am c8db4536: am 7e51102c: Merge "Validate MTP path" into lmp-dev

* commit 'c8db4536507a87a35d05ea47f9c864eb9deda2d7':
  Validate MTP path