Merge "snapuserd: pass arguments by reference"