Packaging for JWR58

Change-Id: I3aeace69c9b433676df735eb3a82cc2c5a23387e
diff --git a/factory-images/generate-factory-images-package.sh b/factory-images/generate-factory-images-package.sh
index 435fb80..7718b7b 100755
--- a/factory-images/generate-factory-images-package.sh
+++ b/factory-images/generate-factory-images-package.sh
@@ -30,22 +30,23 @@
 # 551245 = JDP82
 # 573038 = JDQ39
 # 683083 = JWR51
+# 689345 = JWR58
 
 source ../../../common/clear-factory-images-variables.sh
-BUILD=683083
+BUILD=689345
 DEVICE=maguro
 PRODUCT=yakju
-VERSION=jwr51
+VERSION=jwr58
 #SRCPREFIX=signed-
 BOOTLOADER=primemd04
 RADIO=i9250xxlj1
 source ../../../common/generate-factory-images-common.sh
 
 source ../../../common/clear-factory-images-variables.sh
-BUILD=683083
+BUILD=689345
 DEVICE=maguro
 PRODUCT=takju
-VERSION=jwr51
+VERSION=jwr58
 #SRCPREFIX=signed-
 BOOTLOADER=primemd04
 RADIO=i9250xxlj1
diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh
index c1de967..31e1a11 100755
--- a/self-extractors/generate-packages.sh
+++ b/self-extractors/generate-packages.sh
@@ -54,6 +54,7 @@
 # 683083 = JWR51
 # 684634 = JWR52
 # 686185 = JWR53
+# 689345 = JWR58
 # end jb-mr2-dev
 BRANCH=jb-mr2-dev
 if test $BRANCH = ics-mr1
@@ -78,8 +79,8 @@
 fi # jb-mr1.1-dev
 if test $BRANCH = jb-mr2-dev
 then
-  ZIP=yakju-ota-686185
-  BUILD=jwr53
+  ZIP=yakju-ota-689345
+  BUILD=jwr58
 fi # jb-mr2-dev
 ROOTDEVICE=maguro
 DEVICE=maguro