[ros-diffs] [hbelusca] 73085: [NTVDM]: Properly fixes build. Addendum to r73082, supersedes r73084. CORE-10340