am 827f1915: am 6c555ea3: (-s ours) Merge "Return path including executable instead of without" into lmp-mr1-dev

* commit '827f19154c740011bb974772211efdbece771c25':
  Return path including executable instead of without