Merge "Fix an NPE in WatchdogEventLogger#stop" into rvc-dev am: 1ad1f993 am: c6445845 am: 380c73f7 Change-Id: Ife3b9cb550c20f07f051f80ed924e641f8cff334