am 8a502000: Merge "init: expand_props for onrestart commands."

* commit '8a502000d15cce102569d3609e24846ef19a4a77':
  init: expand_props for onrestart commands.