diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 917e4dc820..5196f6321e 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -861,6 +861,10 @@ def LoadInfoDict(input_file, repacking=False):
         d["avb_{}_salt".format(partition)] = sha256(
             fingerprint.encode()).hexdigest()
 
+    # Set up the salt for partitions without build.prop
+    if build_info.fingerprint:
+      d["avb_salt"] = sha256(build_info.fingerprint.encode()).hexdigest()
+
     # Set the vbmeta digest if exists
     try:
       d["vbmeta_digest"] = read_helper("META/vbmeta_digest.txt").rstrip()