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

Change-Id: Ib86885e9bef10bc7319960d0497de9802df4da77