Merge "Fix and re-enable ApiQueryLanguageinfoTest"