Merge "Work on issue #29042642: Watchdog going off" into nyc-dev am: 5a6cf3ac9a
am: 340f22fcc6

* commit '340f22fcc60f0e5d54cd9740b3995170d0c70c62':
  Work on issue #29042642: Watchdog going off

Change-Id: Iea9d7b29a9a7bc0b0d87387088f001d61ada83e7