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

Change-Id: I5b3b6e2dd9c3696fad262711290e484f4298205b