diff --git a/self-extractors_cheetah/google_devices/staging/Android.mk b/self-extractors_cheetah/google_devices/staging/Android.mk
index 8e8b2fc..30e6278 100644
--- a/self-extractors_cheetah/google_devices/staging/Android.mk
+++ b/self-extractors_cheetah/google_devices/staging/Android.mk
@@ -29,7 +29,7 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_BUILT_MODULE_STEM := package.apk
 LOCAL_SYSTEM_EXT_MODULE := true
 LOCAL_PRIVILEGED_MODULE := true
-LOCAL_MODULE_OWNER := samsung
+LOCAL_MODULE_OWNER := google
 LOCAL_MODULE_CLASS := APPS
 LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
 LOCAL_CERTIFICATE := platform
diff --git a/self-extractors_panther/google_devices/staging/Android.mk b/self-extractors_panther/google_devices/staging/Android.mk
index db9e432..21f8297 100644
--- a/self-extractors_panther/google_devices/staging/Android.mk
+++ b/self-extractors_panther/google_devices/staging/Android.mk
@@ -29,7 +29,7 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_BUILT_MODULE_STEM := package.apk
 LOCAL_SYSTEM_EXT_MODULE := true
 LOCAL_PRIVILEGED_MODULE := true
-LOCAL_MODULE_OWNER := samsung
+LOCAL_MODULE_OWNER := google
 LOCAL_MODULE_CLASS := APPS
 LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
 LOCAL_CERTIFICATE := platform