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