Merge "Fix fastdeploy failure in Windows" am: 09158b1d5a am: 9ac57ceae7
am: 9875bcd839

Change-Id: Ic49cf28ad437b6269d2c35920f48970b8db38c1b