am af675222: Merge "Fix potential segfault in RS watchdog." into ics-mr0

* commit 'af675222f6340a8a9edbe9e8635014a18521e5e0':
  Fix potential segfault in RS watchdog.