diff --git a/core/product.mk b/core/product.mk
index c8e0e9484..fc74f25ee 100644
--- a/core/product.mk
+++ b/core/product.mk
@@ -30,6 +30,7 @@
 define _find-android-products-files
 $(sort $(shell test -d device && find device -maxdepth 6 -name AndroidProducts.mk)) \
   $(sort $(shell test -d vendor && find vendor -maxdepth 6 -name AndroidProducts.mk)) \
+  $(sort $(shell test -d product && find product -maxdepth 6 -name AndroidProducts.mk)) \
   $(SRC_TARGET_DIR)/product/AndroidProducts.mk
 endef
 
diff --git a/envsetup.sh b/envsetup.sh
index 932852719..c3e467c6c 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1541,7 +1541,8 @@ fi
 
 # Execute the contents of any vendorsetup.sh files we can find.
 for f in `test -d device && find -L device -maxdepth 4 -name 'vendorsetup.sh' 2> /dev/null | sort` \
-         `test -d vendor && find -L vendor -maxdepth 4 -name 'vendorsetup.sh' 2> /dev/null | sort`
+         `test -d vendor && find -L vendor -maxdepth 4 -name 'vendorsetup.sh' 2> /dev/null | sort` \
+         `test -d product && find -L product -maxdepth 4 -name 'vendorsetup.sh' 2> /dev/null | sort`
 do
     echo "including $f"
     . $f