am 9b09bf4a: am 10821da3: am 8a502000: Merge "init: expand_props for onrestart commands."

* commit '9b09bf4aedd49f8854b3d614547cb07a4986c335':
  init: expand_props for onrestart commands.