Merge "ApiQueryLinks: Remove index forcing"