Merge "init: watchdog restarted during shutdown fsck"
am: 3443caa

* commit '3443caa2fe8bfd7ef0d1f2cac8fea4dc6530a9cf':
  init: watchdog restarted during shutdown fsck

Change-Id: I7b16347948ffb1b39cd787dc10056e56bfc3ed0c