Merge "snapuserd: Refactor client to allow persistent connections."