Cleanup setToClient calls.

Change-Id: Ie2898f44d623f34e1243d62417d4884e8ca649c1
1 file changed