Merge "Validate MTP path" into lmp-dev