Merge 9a41a6634747df2f3f7fdaa448bcab46d1418f8b on remote branch

Change-Id: I94022a8e0b9d0dcd716d6243d01c3944237c3efa
diff --git a/vendor_product.mk b/vendor_product.mk
index cc52769..7800f9e 100644
--- a/vendor_product.mk
+++ b/vendor_product.mk
@@ -1,8 +1,8 @@
 # UFS init scripts
-PRODUCT_PACKAGES += init.qti.ufs.rc
 
 # additional debugging on userdebug/eng builds
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+  PRODUCT_PACKAGES += init.qti.ufs.rc
   PRODUCT_PACKAGES += init.qti.ufs.debug.sh
 endif