Merge "Populate BRILLO_PRODUCT_ID from the product config"
am: d279f0614d

* commit 'd279f0614d32554b524ce1618751583b70f33b96':
  Populate BRILLO_PRODUCT_ID from the product config