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

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