[SUITEDEV-2114] Fix the algorithm prefix and vendor key
Merge remote-tracking branch 'origin/master'

* origin/master:
  [SUITEDEV-2114] merge sonic's pull request
  [SUITEDEV-2114] handle clock skew