Merge changes Ic46ac54b,Id787e70f

* changes:
  Implement keepAliveBinder for setRpcClientDebug
  Add keepAliveBinder argument to setRpcClientDebug.