Merge "More defensive RPC handling in DOM Broker"