Merge "init: fixed issues related to forking services" am: 03d67dd99e
am: 0f9791bdd3

Change-Id: I2fa0c42f1ac075c636930cea435d19ac801b7e15