Merge "Revert "[T8TSK-227][sink]Optimize sink code of factory test"" into GSW3.0-No-Connman