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

* commit '6c555ea3058d957795c40bc07b264701427453a2':
  Return path including executable instead of without