Update RPC code from OSLO

Fixes bug 1172922

Change-Id: Ieb5f58fe3d2c879bc71f4241288e48e35ab54366
Merge "Update RPC code from OSLO"