Merge "Speed up ApiQuerySiteinfoTest:testContinuation"