Merge "Fix file path calculation for asset files."