diff --git a/default-permissions.xml b/default-permissions.xml
index fc00a30..a0aa143 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -67,9 +67,6 @@
 
     <exception package="com.google.android.apps.pixel.creativeassistant">
         <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
-        <permission name="android.permission.READ_MEDIA_IMAGES" fixed="false"/>
-        <permission name="android.permission.READ_EXTERNAL_STORAGE" fixed="false"/>
-        <permission name="android.permission.WRITE_EXTERNAL_STORAGE" fixed="false"/>
     </exception>
 
     <exception package="com.google.android.apps.cbrsnetworkmonitor">
diff --git a/device.mk b/device.mk
index e566eaf..979e902 100644
--- a/device.mk
+++ b/device.mk
@@ -979,6 +979,7 @@ ifneq ($(BOARD_WITHOUT_RADIO),true)
 # modem_ml_svc_sit daemon
 PRODUCT_PACKAGES += modem_ml_svc_sit
 
+ifeq (,$(filter aosp_%,$(TARGET_PRODUCT)))
 # Modem ML TFLite service.
 PRODUCT_PACKAGES += modemml-tflite-service \
 	libtensorflowlite_jni
@@ -992,6 +993,7 @@ PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
 	system/lib64/libtensorflowlite_jni.so
 
 PRODUCT_SYSTEM_SERVER_JARS += modemml-tflite-service
+endif
 
 # modem ML models configs
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))