Split client and server impl am: a6d6fa3d9d

Change-Id: Ie5ea7a0bbd7736b6aa25261553d67d9507c81c27