diff --git a/aosp/frameworks/native/data/etc/android.hardware.bluetooth.xml b/aosp/frameworks/native/data/etc/android.hardware.bluetooth.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8d681c84d448757bcc28fdc9375a471b02898949
--- /dev/null
+++ b/aosp/frameworks/native/data/etc/android.hardware.bluetooth.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source 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.
+-->
+<!-- Adds the feature indicating support for the Bluetooth API -->
+<permissions>
+    <!-- <feature name="android.hardware.bluetooth" /> -->
+</permissions>
diff --git a/aosp/frameworks/native/data/etc/android.hardware.bluetooth_le.xml b/aosp/frameworks/native/data/etc/android.hardware.bluetooth_le.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b46e85c0286e7b7f2694e17f0522e9e065f4757f
--- /dev/null
+++ b/aosp/frameworks/native/data/etc/android.hardware.bluetooth_le.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source 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.
+-->
+<!-- Adds the feature indicating support for the Bluetooth Low Energy API -->
+<permissions>
+    <!-- <feature name="android.hardware.bluetooth_le" /> -->
+</permissions>
diff --git a/aosp/frameworks/native/data/etc/handheld_core_hardware.xml b/aosp/frameworks/native/data/etc/handheld_core_hardware.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a45ced6d199c21b131bd4dd336ee0affcb2d0c75
--- /dev/null
+++ b/aosp/frameworks/native/data/etc/handheld_core_hardware.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source 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.
+-->
+
+<!-- These are the hardware components that all handheld devices except Android Go
+     must include, for Android Go devices include go_handheld_core_hardware.xml.
+     Devices with optional hardware must also include extra hardware files, per the comments below.
+
+     Handheld devices include phones, mobile Internet devices (MIDs),
+     Personal Media Players (PMPs), small tablets (7" or less), and similar
+     devices.
+-->
+<permissions>
+    <!-- This is Android and fully CTS compatible.  Basically this is for CTS tests to use. -->
+    <feature name="android.software.cts" />
+
+    <feature name="android.hardware.audio.output" />
+    <feature name="android.hardware.camera" />
+    <feature name="android.hardware.location" />
+    <feature name="android.hardware.location.network" />
+    <feature name="android.hardware.sensor.compass" />
+    <feature name="android.hardware.sensor.accelerometer" />
+    <!-- <feature name="android.hardware.bluetooth" /> -->
+    <feature name="android.hardware.touchscreen" />
+    <feature name="android.hardware.microphone" />
+    <feature name="android.hardware.screen.portrait" />
+    <feature name="android.hardware.screen.landscape" />
+    <!-- Indicate support for the Android security model per the CDD. -->
+    <feature name="android.hardware.security.model.compatible" />
+
+    <!-- basic system services -->
+    <feature name="android.software.app_widgets" />
+    <feature name="android.software.telecom" />
+    <feature name="android.software.voice_recognizers" notLowRam="true" />
+    <feature name="android.software.backup" />
+    <feature name="android.software.home_screen" />
+    <feature name="android.software.input_methods" />
+    <feature name="android.software.picture_in_picture" notLowRam="true" />
+    <feature name="android.software.activities_on_secondary_displays" notLowRam="true" />
+    <feature name="android.software.print" />
+    <feature name="android.software.companion_device_setup" />
+    <feature name="android.software.autofill" />
+    <feature name="android.software.credentials" />
+    <feature name="android.software.cant_save_state" />
+    <feature name="android.software.secure_lock_screen" />
+    <feature name="android.software.window_magnification" />
+
+    <!-- Feature to specify if the device supports adding device admins. -->
+    <feature name="android.software.device_admin" />
+
+    <!-- Feature to specify if the device support managed users. -->
+    <feature name="android.software.managed_users" notLowRam="true"/>
+
+    <!-- Feature to specify if the device supports controls. -->
+    <feature name="android.software.controls" />
+
+    <!-- Devices with all optimizations required to support VR Mode and
+         pass all CDD requirements for this feature may include
+         android.hardware.vr.high_performance -->
+    <!-- Devices that support VR headtracking features and pass all CDD
+         requirements may include
+         android.hardware.vr.headtracking -->
+
+    <!-- devices with GPS must include android.hardware.location.gps.xml -->
+    <!-- devices with an autofocus camera and/or flash must include either
+         android.hardware.camera.autofocus.xml or
+         android.hardware.camera.autofocus-flash.xml -->
+    <!-- devices with a front facing camera must include
+         android.hardware.camera.front.xml -->
+    <!-- devices with WiFi must also include android.hardware.wifi.xml -->
+    <!-- devices that support multitouch must include the most appropriate one
+         of these files:
+
+         If only partial (non-independent) pointers are supported:
+         android.hardware.touchscreen.multitouch.xml
+
+         If up to 4 independently tracked pointers are supported:
+         include android.hardware.touchscreen.multitouch.distinct.xml
+
+         If 5 or more independently tracked pointers are supported:
+         include android.hardware.touchscreen.multitouch.jazzhand.xml
+
+         ONLY ONE of the above should be included. -->
+    <!-- devices with an ambient light sensor must also include
+         android.hardware.sensor.light.xml -->
+    <!-- devices with a proximity sensor must also include
+         android.hardware.sensor.proximity.xml -->
+    <!-- GSM phones must also include android.hardware.telephony.gsm.xml -->
+    <!-- CDMA phones must also include android.hardware.telephony.cdma.xml -->
+    <!-- Devices that have low-latency audio stacks suitable for apps like
+         VoIP may include android.hardware.audio.low_latency.xml. ONLY apps
+         that meet the requirements specified in the CDD may include this. -->
+</permissions>
diff --git a/aosp/system/vold/Utils.cpp b/aosp/system/vold/Utils.cpp
index a6d065c6ea5e1a4870da273fbc24cfd0193ea201..2e803715c4bdb03acc55aae3e2c679f4c34596a6 100644
--- a/aosp/system/vold/Utils.cpp
+++ b/aosp/system/vold/Utils.cpp
@@ -245,10 +245,10 @@ int SetQuotaProjectId(const std::string& path, long projectId) {
 
     fsx.fsx_projid = projectId;
     ret = ioctl(fd, FS_IOC_FSSETXATTR, &fsx);
-    if (ret == -1) {
-        PLOG(ERROR) << "Failed to set project id on " << path;
-    // return ret;
-    }
+    // if (ret == -1) {
+    //     PLOG(ERROR) << "Failed to set project id on " << path;
+    //     return ret;
+    // }
     return 0;
 }
 
diff --git a/aosp/vendor/common/etc/handheld_core_hardware.xml b/aosp/vendor/common/etc/handheld_core_hardware.xml
index fa5d64eb343b1cf0a03fc8c2e3e27bb363214b38..3364f22b13f14106f83666372320df8ae1990b98 100644
--- a/aosp/vendor/common/etc/handheld_core_hardware.xml
+++ b/aosp/vendor/common/etc/handheld_core_hardware.xml
@@ -23,8 +23,8 @@
     <feature name="android.hardware.telephony.gsm" />
 
     <!-- Bluetooth features -->
-    <feature name="android.hardware.bluetooth" />
-    <feature name="android.hardware.bluetooth_le" />
+    <!-- <feature name="android.hardware.bluetooth" /> -->
+    <!-- <feature name="android.hardware.bluetooth_le" /> -->
 
     <!-- Normal ram size-->
     <feature name="android.hardware.ram.normal" />