am c56668eb: am 3ced9617: Merge "Use original path if translated path doesn\'t exist" into mnc-dev

* commit 'c56668eb223fe45ff5c1e399d99943838320c407':
  Use original path if translated path doesn't exist