Merge "init: don't wait if we have more work to do" am: 32ee9fc24a am: c746ecbcbe am: df47019a30
am: a88839684a

Change-Id: Ifd96457847918dd79b19407736feef27a2bc2b5d