Fix MSVC build

Change-Id: I64a9a2933b38e48c4531564ab4082e3c924c4959