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

* commit 'e4c8b31fed15d1e246450d6e7821ca07915b888c':
  init: watchdog restarted during shutdown fsck

Change-Id: I6814deb12ee788928db734852098873e6d732067