Merge "Populate BRILLO_PRODUCT_ID from the product config"