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