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

* commit '92e245e8f652c7d733641355363ade7f8e9f17a5':