am aa4b2ee0: Merge "Ignore outstanding delayed shutdown on restart" into jb-mr2-dev

* commit 'aa4b2ee0d654b345b727cb47afd246d0b769fafd':
  Ignore outstanding delayed shutdown on restart