Move RPC into common

Change-Id: I493415d633027a687b30ab6eb283f5e173528f40
Merge "Move RPC into common"