Use MockSiteStore for testing

Change-Id: I783bd952759d001767f795178ab19c33872d7e17
Merge "Use MockSiteStore for testing"