Merge "init: allow customizable restart and timeout periods for services" am: 5f2a21d244
am: 63bd73a5cf

Change-Id: I649c79d218f28ddb95c8c1a18f91657d7e1e4ca9