Merge "Update base configuration to expose RPC broker service"