am 525322ec: am f9f740da: Merge "Support different watchdog timeouts for...
am 525322ec: am f9f740da: Merge "Support different watchdog timeouts for different entities" into klp-dev
* commit '525322ec':
Support different watchdog timeouts for different entities