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

Change-Id: Ia1ebbffce9bc510d28d03f76e9e4e8a53ec39198