RPC clients debugging

Change-Id: Id58598497b2624ec035745a15233ab36cf0d725c