Merge "TBR syncslides: fix bug where Fake discovery was trying to make real RPC."