diff --git a/scripts/gen_build_prop.py b/scripts/gen_build_prop.py
index ed37b7aa7..56e1188b3 100644
--- a/scripts/gen_build_prop.py
+++ b/scripts/gen_build_prop.py
@@ -102,6 +102,9 @@ def parse_args():
 
   config["MinusDevice"] = config["DeviceName"]
 
+  if config["BuildNumber"].startswith("eng."):
+    config["BuildNumber"] = config["DateUtc"]
+
   override_config(config)
 
   append_additional_system_props(args)