Merge "snapuserd: Update verification"