Merge "Fix "make product-graph" and "make dump-products"."