Merge changes Id1340420,I92b1abbd

* changes:
  Add a Subject to simplify WatchdogEventLogger assertion (2/n)
  Use Truth (1/n)