Update Oslo rpc

Updated the rpc module for import order fix

Change-Id: I09332425827778672dc232b15ebefd9f9a6dd34a
Merge "Update Oslo rpc"