Split client and server impl am: a6d6fa3d9d am: 6fc5d41149

Change-Id: I9bbfb68474081526cf1918b9e96c42f85d8035e7