RPC deadlock fix

Change-Id: Icad9b12f36e71d786185f0dbd44a1c1672cc8210