Merge "Use original path if translated path doesn't exist" into mnc-dev