Merge "Remove deprecated methods in ApiQuery"