Try to fix MSVC build

Change-Id: I24c48d2540a8cb7d2a823862d53cddf90d41f94a