Merge "init: expand_props for onrestart commands."