diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 2c8169a..73cbe2f 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -24,7 +24,9 @@ TARGET_BOOTLOADER_BOARD_NAME := bengal
 TARGET_NO_BOOTLOADER := true
 
 # Filesystem
-TARGET_FS_CONFIG_GEN := $(COMMON_PATH)/config.fs
+TARGET_FS_CONFIG_GEN := \
+    $(COMMON_PATH)/config.fs \
+    $(COMMON_PATH)/mot_aids.fs
 
 # Kernel
 BOARD_BOOT_HEADER_VERSION := 3
diff --git a/mot_aids.fs b/mot_aids.fs
new file mode 100644
index 0000000..48f88cb
--- /dev/null
+++ b/mot_aids.fs
@@ -0,0 +1,80 @@
+#
+# Copyright (C) 2017 The LineageOS Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+[AID_VENDOR_MOT_ACCY]
+value: 5000
+
+[AID_VENDOR_MOT_PWRIC]
+value: 5001
+
+[AID_VENDOR_MOT_USB]
+value: 5002
+
+[AID_VENDOR_MOT_DRM]
+value: 5003
+
+[AID_VENDOR_MOT_TCMD]
+value: 5004
+
+[AID_VENDOR_MOT_SEC_RTC]
+value: 5005
+
+[AID_VENDOR_MOT_TOMBSTONE]
+value: 5006
+
+[AID_VENDOR_MOT_TPAPI]
+value: 5007
+
+[AID_VENDOR_MOT_SECCLKD]
+value: 5008
+
+[AID_VENDOR_MOT_WHISPER]
+value: 5009
+
+[AID_VENDOR_MOT_CAIF]
+value: 5010
+
+[AID_VENDOR_MOT_DLNA]
+value: 5011
+
+[AID_VENDOR_MOT_ATVC]
+value: 5012
+
+[AID_VENDOR_MOT_DBVC]
+value: 5014
+
+[AID_VENDOR_FINGERP]
+value: 5015
+
+[AID_VENDOR_MOT_ESDFS]
+value: 5016
+
+[AID_VENDOR_POWER]
+value: 5017
+
+[AID_VENDOR_ITSON]
+value: 5018
+
+[AID_VENDOR_MOT_DTV]
+value: 5019
+
+[AID_VENDOR_MOT_MOD]
+value: 5020
+
+[AID_VENDOR_MOT_SHARED]
+value: 5323
+
+[AID_VENDOR_MOT_COMMON]
+value: 5341