Windows build fix

Change-Id: I686457ca92ce1d503ea184e4d613b880610942da