diff --git a/non_plat/file_contexts b/non_plat/file_contexts
index f0b7124..4515fae 100644
--- a/non_plat/file_contexts
+++ b/non_plat/file_contexts
@@ -678,3 +678,10 @@
 /vendor/bin/hw/android\.hardware\.drm@1\.2-service\.clearkey           u:object_r:hal_drm_clearkey_exec:s0
 /vendor/bin/hw/android\.hardware\.drm@1\.2-service-lazy\.clearkey      u:object_r:hal_drm_clearkey_exec:s0
 
+
+# Date : 2019/10/28
+# Purpose : move these contexts from plat_private/file_contexts
+/(system\/vendor|vendor)/bin/aee_aedv u:object_r:aee_aedv_exec:s0
+/(system\/vendor|vendor)/bin/aee_aedv64 u:object_r:aee_aedv_exec:s0
+/vendor/bin/aeev  u:object_r:aee_aedv_exec:s0
+
diff --git a/plat_private/file_contexts b/plat_private/file_contexts
index c60f3e1..370df31 100644
--- a/plat_private/file_contexts
+++ b/plat_private/file_contexts
@@ -29,11 +29,6 @@
 /system/bin/lbs_dbg u:object_r:lbs_dbg_exec:s0
 /system/bin/connsyslogger u:object_r:connsyslogger_exec:s0
 
-# google suggest that move aee_aedv_exec to platform @google_issue_id:64130120
-/(system\/vendor|vendor)/bin/aee_aedv u:object_r:aee_aedv_exec:s0
-/(system\/vendor|vendor)/bin/aee_aedv64 u:object_r:aee_aedv_exec:s0
-/vendor/bin/aeev  u:object_r:aee_aedv_exec:s0
-
 # storagemanager daemon
 # it is used to mount all storages in meta/factory mode
 /system/bin/storagemanagerd u:object_r:vold_exec:s0
diff --git a/r_non_plat/file_contexts b/r_non_plat/file_contexts
index 7bce018..166a791 100644
--- a/r_non_plat/file_contexts
+++ b/r_non_plat/file_contexts
@@ -676,3 +676,9 @@
 /vendor/bin/hw/android\.hardware\.drm@1\.2-service\.clearkey           u:object_r:hal_drm_clearkey_exec:s0
 /vendor/bin/hw/android\.hardware\.drm@1\.2-service-lazy\.clearkey      u:object_r:hal_drm_clearkey_exec:s0
 
+
+# Date : 2019/10/28
+# Purpose : move these contexts from plat_private/file_contexts
+/(system\/vendor|vendor)/bin/aee_aedv u:object_r:aee_aedv_exec:s0
+/(system\/vendor|vendor)/bin/aee_aedv64 u:object_r:aee_aedv_exec:s0
+/vendor/bin/aeev  u:object_r:aee_aedv_exec:s0