divyenpatel: Cherry pick windows support fixes to release 2.7

No Results