am 372d668a: am 39021a48: am 83ada447: Merge changes Ib54f39fd,I7e36edd8

* commit '372d668a279934ff3b2ec2f07a76fe2f351789d5':
  init: Retain traditional restart behavior for critical and oneshot services.
  init: Safely restart services to avoid race conditions.