Merge "init: Check onrestart commands" am: 980cbef0c5 am: fe837fe0ee
am: 7e4a114768

Change-Id: Id3e9e335a76a7cb8360cecacfaeb52d9dd203413