cherry pick for the PR#17101#19748

prabhataravind merged 1 commit intosonic-net:mastersonic-net/sonic-mgmt:masterfrom

nnelluri-cisco:watchdog_changes_cisconnelluri-cisco/sonic-mgmt:watchdog_changes_ciscoCopy head branch name to clipboard