Fix a couple places using watchdog wrong

Change-Id: I4e6bd0bd5feb940dc099c8b6b0f99511d469c13f
Merge "Fix a couple places using watchdog wrong"