Avoid calling SiteStore::getSites to boost performance

Change-Id: I77aab6e9fd3a301d293942c6393979df2160eaf6
Merge "Avoid calling SiteStore::getSites to boost performance"