Merge "Fix "make product-graph" and "make dump-products"." am: 888f30aa44
am: 603e4ed594

* commit '603e4ed594b99b9463a9a67c1f7ba91b2967025e':
  Fix "make product-graph" and "make dump-products".