Merge "Revert "Use resolved path for both checking and opening."" into mnc-dr1.5-dev