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