Merge pull request #18030 from Microsoft/sjw/pull_id_hack

[TP4] Windows: hacking around content addressable IDs for temporary fix.