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

* commit '10821da3221ce4fe021c80956a5cac733c97ebb9':
  init: expand_props for onrestart commands.