diff --git a/overlay/common/packages/services/OmniJaws/res/values/config.xml b/overlay/common/packages/services/OmniJaws/res/values/config.xml
index 9ceaad0..6785c48 100644
--- a/overlay/common/packages/services/OmniJaws/res/values/config.xml
+++ b/overlay/common/packages/services/OmniJaws/res/values/config.xml
@@ -20,7 +20,7 @@
     <add-resource type="string" name="owm_api_key_1" />
     <add-resource type="string" name="owm_api_key_2" />
 
-    <string name="owm_api_key_1" translatable="false" >a82cbdeeb0dad6aeb9262e76402c2bcd</string>
+    <string name="owm_api_key_1" translatable="false" >f839981a9e6195410e563ef35d1e7fb4</string>
     <string name="owm_api_key_2" translatable="false" >8d593110ad8e484d4ec4805ef851f726</string>
 
 </resources>
diff --git a/utils/emulator/overlay/frameworks/base/core/res/res/values/config.xml b/utils/emulator/overlay/frameworks/base/core/res/res/values/config.xml
index 6deb362..bb1ed31 100644
--- a/utils/emulator/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/utils/emulator/overlay/frameworks/base/core/res/res/values/config.xml
@@ -35,8 +35,6 @@
     black in software (to avoid aliasing or emulate a cutout that is not physically existent).
     -->
     <bool name="config_fillMainBuiltInDisplayCutout">true</bool>
-    <bool name="config_windowIsRound">true</bool>
-    <bool name="config_smart_battery_available">true</bool>
     <bool name="config_intrusiveNotificationLed">true</bool>
     <bool name="config_intrusiveBatteryLed">true</bool>
     <bool name="config_FastChargingLedSupported">true</bool>
diff --git a/utils/emulator/overlay/frameworks/base/core/res/res/values/dimens.xml b/utils/emulator/overlay/frameworks/base/core/res/res/values/dimens.xml
deleted file mode 100644
index fd0fef2..0000000
--- a/utils/emulator/overlay/frameworks/base/core/res/res/values/dimens.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2017, 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.
-*/
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <dimen name="config_dialogCornerRadius">8.0dip</dimen>
-    <dimen name="config_buttonCornerRadius">4.0dip</dimen>
-    <dimen name="config_progressBarCornerRadius">8.0dip</dimen>
-</resources>