I applied the same for Windows part, hope there won't be any building pb

Change-Id: Id62c8c5f60e7a525d82c36ced944b71cc5c28b78