Merge "Fix fastdeploy failure in Windows"
am: 09158b1d5a

Change-Id: I31b412fd193c2e5622eacad72c65e36c4a1b249a