Massage watchdog calls and inline documentation

Change-Id: Ic75be00ac820cc889059f815fa3b0273853ae677
Merge "Massage watchdog calls and inline documentation"