Merge "init: add reboot_on_failure service option" am: a550e7f412 am: d05b5fd333
am: ded10f01e2

Change-Id: Id952e74fa71d654e8981b431f3656da416fd4d5c