Windows build fix

Change-Id: I583bdd69d08dd4e3b2f8454e9cee0fa0f3bc6b75