Merge "Work on issue #29042642: Watchdog going off" into nyc-dev am: 5a6cf3ac9a am: c9aaec43a6
am: 1d185fbad7

* commit '1d185fbad7bbd1139039283b642655b150884108':
  Work on issue #29042642: Watchdog going off

Change-Id: I659acd8ca9d2b1ddd7992d1c079dd968e60befad