Fix Windows Python/Debug build issue.

Change-Id: I7753a68ebea82949cc20c0bedd082224a5b238a5
Merge topic 'catalyst_2.0' into next

5454320 Fix Windows Python/Debug build issue.