Fixed RPC errors introduced during merge with master

Change-Id: I1cd44d0f1fbcbcd74acf47b3590b4c9db481caf0