[SUITEDEV-2114] handle clock skew
[SUITEDEV-2114] merge sonic's pull request
merge conflict