am a6d23bd6: (-s ours) am 10821da3: am 8a502000: Merge "init: expand_props for onrestart commands."

* commit 'a6d23bd6d2c31c1de69a97d78ab1e557bedcc04a':