Merge "init: fix process restarting" am: eb3fa92191 am: 25422816d4 am: b435774e01 am: 2f77438b4d
am: f62a7f56fe

Change-Id: Ib79373edb57d6f01cc518bed84be13a18f92aea5