Merge "Split SiteLookup interface from SiteStore"