Fixed Windows build error.

Change-Id: I46748d208b8a45f6778b6e0ea3c54a999577eaa6
Merge topic 'catalyst_fix_plugins' into next

0f47d901 Fixed Windows build error.