Instance ID is too overloaded and the uses are beginning to conflict. Separate the RPC configuration out. Change-Id: I712731130339fee4fc8de4dc2d0fea7040773c58 Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Change-Id: Ic62badb272655b68883d3fe3484b2e67e01837e4 Signed-off-by: Cunyin Chang <cunyin.chang@intel.com>