small changes to the code before the commit for supporting windows os

Change-Id: I062add6d6340677a9e2e98ac47d53c87ad2a6535
3 files changed