Merge from jb-mr1-aah-dev

Change-Id: I690b2e7bf9a06fa53fd6fc922f619b6a0020d158
diff --git a/factory-images/generate-factory-images-package.sh b/factory-images/generate-factory-images-package.sh
index 98a4547..b381217 100755
--- a/factory-images/generate-factory-images-package.sh
+++ b/factory-images/generate-factory-images-package.sh
@@ -21,22 +21,23 @@
 # 330937 = IMM76I
 # 397360 = JRO02C
 # 398337 = JRO03C
+# 477516 = JZO54I
 
 source ../../../common/clear-factory-images-variables.sh
-BUILD=398337
+BUILD=477516
 DEVICE=maguro
 PRODUCT=yakju
-VERSION=jro03c
+VERSION=jzo54i
 SRCPREFIX=signed-
 BOOTLOADER=primelc03
 RADIO=i9250xxlf1
 source ../../../common/generate-factory-images-common.sh
 
 source ../../../common/clear-factory-images-variables.sh
-BUILD=398337
+BUILD=477516
 DEVICE=maguro
 PRODUCT=takju
-VERSION=jro03c
+VERSION=jzo54i
 SRCPREFIX=signed-
 BOOTLOADER=primelc03
 RADIO=i9250xxlf1