Windows build fix

Change-Id: I59c24c04965d7c582a1288d86cb589eb3c8290a2