Merge "[automerger skipped] init: Wait for snapuserd before starting second stage am: 36a78b8e75 -s ours"