Merge "Integrate snapuserd with dm-user ABI changes."