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

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