fix device sync during clean build

Change-Id: Ie5e433d351411f35c14788107ca36c40a026646e