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

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