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

Change-Id: Ib180234a76eb7e80aeefb1522911d4229a727dac