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

Change-Id: I8abe4b430bf375e4b347daeb189ca9baa42da241