Merge "init: print service name when started waiting" am: d41a1f9add
am: 736d63c7d1

Change-Id: Ie1463477d84c5154c23ba312bffab2f05fa8d247