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

Change-Id: I25e011de5ae99fdda1e4c0c88d6de9056ea8189a