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

Change-Id: I5924728b6e9fd206f201d64ed47ed2a3d0ce3838