diff --git a/res/drawable/ic_privacy_shield_24dp.xml b/res/drawable/ic_privacy_shield_24dp.xml
index a051e88..540dcd7 100644
--- a/res/drawable/ic_privacy_shield_24dp.xml
+++ b/res/drawable/ic_privacy_shield_24dp.xml
@@ -19,7 +19,7 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?android:attr/textColorSecondary">>
+        android:tint="?android:attr/textColorSecondary">
     <path
         android:fillColor="#FF000000"
         android:pathData="M12,2L3.82,5.64v5.45c0,5.05 3.49,9.76 8.18,10.91c4.69,-1.15 8.18,-5.86 8.18,-10.91V5.64L12,2zM18.18,11.09c0,1.55 -0.41,3.05 -1.1,4.38C15.77,14.5 13.4,14 12,14s-3.77,0.5 -5.08,1.47c-0.69,-1.33 -1.1,-2.83 -1.1,-4.38V6.94L12,4.19l6.18,2.75V11.09z"/>
diff --git a/res/layout/advanced_bt_entity_header.xml b/res/layout/advanced_bt_entity_header.xml
index 6dd565f..755247f 100644
--- a/res/layout/advanced_bt_entity_header.xml
+++ b/res/layout/advanced_bt_entity_header.xml
@@ -29,7 +29,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:singleLine="false"
         android:ellipsize="marquee"
         android:textDirection="locale"/>
 
@@ -40,7 +39,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="2dp"
-        android:singleLine="false"
         android:ellipsize="marquee"
         android:textDirection="locale"/>
 
diff --git a/res/layout/advanced_bt_entity_sub.xml b/res/layout/advanced_bt_entity_sub.xml
index 3f1b3d3..446bfd2 100644
--- a/res/layout/advanced_bt_entity_sub.xml
+++ b/res/layout/advanced_bt_entity_sub.xml
@@ -39,7 +39,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:gravity="center"
-        android:singleLine="false"
         android:ellipsize="marquee"
         android:textDirection="locale"
         android:layout_marginTop="24dp"
@@ -75,4 +74,4 @@
         android:orientation="horizontal"
         android:visibility="gone"/>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/layout/bluetooth_broadcast_entity_header.xml b/res/layout/bluetooth_broadcast_entity_header.xml
index cc18d94..e65448e 100644
--- a/res/layout/bluetooth_broadcast_entity_header.xml
+++ b/res/layout/bluetooth_broadcast_entity_header.xml
@@ -31,7 +31,6 @@
         style="@style/TextAppearance.EntityHeaderTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:singleLine="false"
         android:ellipsize="marquee"
         android:textDirection="locale"/>
 
@@ -41,7 +40,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/bluetooth_find_broadcast_header_top_margin"
-        android:singleLine="false"
         android:ellipsize="marquee"
         android:textDirection="locale"/>
 
diff --git a/res/layout/bluetooth_pin_confirm.xml b/res/layout/bluetooth_pin_confirm.xml
index 0024ad4..7b5b046 100644
--- a/res/layout/bluetooth_pin_confirm.xml
+++ b/res/layout/bluetooth_pin_confirm.xml
@@ -23,7 +23,6 @@
     android:layout_width="match_parent">
 
     <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
         android:paddingStart="16dip"
         android:layout_height="match_parent"
         android:layout_width="match_parent"
diff --git a/res/layout/bluetooth_pin_entry.xml b/res/layout/bluetooth_pin_entry.xml
index 0c6861c..83ebd87 100644
--- a/res/layout/bluetooth_pin_entry.xml
+++ b/res/layout/bluetooth_pin_entry.xml
@@ -23,7 +23,6 @@
     android:layout_width="match_parent">
 
     <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_height="match_parent"
         android:layout_width="match_parent"
         android:orientation="vertical">
diff --git a/res/layout/icc_lock_tabs.xml b/res/layout/icc_lock_tabs.xml
index d62f595..31fffd2 100644
--- a/res/layout/icc_lock_tabs.xml
+++ b/res/layout/icc_lock_tabs.xml
@@ -25,7 +25,7 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+        <HorizontalScrollView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:scrollbars="none"
diff --git a/res/layout/le_audio_bt_entity_header.xml b/res/layout/le_audio_bt_entity_header.xml
index a05d707..19ba899 100644
--- a/res/layout/le_audio_bt_entity_header.xml
+++ b/res/layout/le_audio_bt_entity_header.xml
@@ -33,7 +33,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:singleLine="false"
         android:ellipsize="marquee"
         android:textDirection="locale"/>
 
@@ -44,7 +43,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="4dp"
-        android:singleLine="false"
         android:ellipsize="marquee"
         android:textDirection="locale"/>
 
diff --git a/res/layout/more_settings_button.xml b/res/layout/more_settings_button.xml
index 7140d79..1637fdf 100644
--- a/res/layout/more_settings_button.xml
+++ b/res/layout/more_settings_button.xml
@@ -16,7 +16,6 @@
   -->
 <FrameLayout
       xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:settings="http://schemas.android.com/apk/res-auto"
       android:layout_width="match_parent"
       android:layout_height="wrap_content">
 
@@ -29,7 +28,6 @@
          android:layout_width="wrap_content"
          android:layout_height="wrap_content"
          android:layout_marginVertical="8dp"
-         android:layout_marginHorizontal="16dp"
-         settings:allowDividerBelow="true"/>
+         android:layout_marginHorizontal="16dp"/>
 
 </FrameLayout>
diff --git a/res/layout/nfc_payment_option.xml b/res/layout/nfc_payment_option.xml
index e523993..263fd2a 100644
--- a/res/layout/nfc_payment_option.xml
+++ b/res/layout/nfc_payment_option.xml
@@ -24,7 +24,7 @@
     android:paddingStart="24dip"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:background="?android:attr/selectableItemBackground">
-    <RadioButton xmlns:android="http://schemas.android.com/apk/res/android"
+    <RadioButton
         android:id="@+id/button"
         android:layout_width="match_parent"
         android:layout_height="fill_parent"
diff --git a/res/layout/notification_channel_panel.xml b/res/layout/notification_channel_panel.xml
index 49cd95c..e59bb5d 100644
--- a/res/layout/notification_channel_panel.xml
+++ b/res/layout/notification_channel_panel.xml
@@ -28,7 +28,6 @@
         android:layout_width="match_parent"/>
 
     <View
-        xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/footer_divider"
         android:layout_width="match_parent"
         android:layout_height="@dimen/horizontal_divider_height"
@@ -63,4 +62,4 @@
             android:layout_marginEnd="12dp"
             android:text="@string/done"/>
     </LinearLayout>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/layout/notification_log_row.xml b/res/layout/notification_log_row.xml
index 847a699..c7a3bf1 100644
--- a/res/layout/notification_log_row.xml
+++ b/res/layout/notification_log_row.xml
@@ -136,7 +136,6 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
                 android:layout_marginStart="30dp"
-                android:singleLine="false"
                 android:textColor="?android:attr/textColorPrimary"
                 android:textSize="10sp"
                 android:fontFamily="monospace"
@@ -149,7 +148,6 @@
             android:orientation="horizontal"
             android:layout_marginStart="30dp"
             android:layout_marginBottom="6dp"
-            android:singleLine="false"
             android:textColor="?android:attr/textColorPrimary"
             android:textSize="10sp"
             android:fontFamily="monospace"
diff --git a/res/layout/preference_widget_sync_toggle.xml b/res/layout/preference_widget_sync_toggle.xml
index a8dcdba..c12b9f6 100644
--- a/res/layout/preference_widget_sync_toggle.xml
+++ b/res/layout/preference_widget_sync_toggle.xml
@@ -38,7 +38,7 @@
         android:layout_marginEnd="8dip"
         android:contentDescription="@string/sync_active" />
 
-    <Switch xmlns:android="http://schemas.android.com/apk/res/android"
+    <Switch
         android:id="@android:id/switch_widget"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/res/layout/vpn_dialog.xml b/res/layout/vpn_dialog.xml
index 9e264f9..892a176 100644
--- a/res/layout/vpn_dialog.xml
+++ b/res/layout/vpn_dialog.xml
@@ -69,7 +69,6 @@
                 <CheckBox style="@style/vpn_value"
                         android:id="@+id/mppe"
                         android:text="@string/vpn_mppe"
-                        android:singleLine="false"
                         android:visibility="gone"/>
 
                 <LinearLayout android:id="@+id/l2tp"
@@ -147,7 +146,6 @@
 
                 <CheckBox style="@style/vpn_value"
                         android:id="@+id/show_options"
-                        android:singleLine="false"
                         android:text="@string/vpn_show_options"/>
             </LinearLayout>
 
@@ -243,7 +241,6 @@
 
                 <CheckBox style="@style/vpn_value"
                         android:id="@+id/save_login"
-                        android:singleLine="false"
                         android:text="@string/vpn_save_login"/>
             </LinearLayout>
 
@@ -254,11 +251,9 @@
                     android:animateLayoutChanges="true">
                 <CheckBox style="@style/vpn_value"
                         android:id="@+id/always_on_vpn"
-                        android:singleLine="false"
                         android:text="@string/vpn_menu_lockdown"/>
                 <TextView style="@style/vpn_warning"
                         android:id="@+id/always_on_invalid_reason"
-                        android:singleLine="false"
                         android:visibility="gone"/>
             </LinearLayout>
         </LinearLayout>
diff --git a/res/layout/zen_mode_senders_overlay_image.xml b/res/layout/zen_mode_senders_overlay_image.xml
index 39c1c20..eba98da 100644
--- a/res/layout/zen_mode_senders_overlay_image.xml
+++ b/res/layout/zen_mode_senders_overlay_image.xml
@@ -16,8 +16,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
-    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                    android:id="@+id/zen_mode_settings_senders_overlay_view"
+    <RelativeLayout android:id="@+id/zen_mode_settings_senders_overlay_view"
                     android:layout_centerInParent="true"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java b/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
index bae2471..ad38fa1 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
@@ -250,8 +250,7 @@
         CheckBox alphanumericPin = (CheckBox) view.findViewById(R.id.alphanumeric_pin);
         CheckBox contactSharing = (CheckBox) view.findViewById(
                 R.id.phonebook_sharing_message_entry_pin);
-        contactSharing.setText(getString(R.string.bluetooth_pairing_shares_phonebook,
-                mPairingController.getDeviceName()));
+        contactSharing.setText(getString(R.string.bluetooth_pairing_shares_phonebook));
         EditText pairingView = (EditText) view.findViewById(R.id.text);
 
         contactSharing.setVisibility(
@@ -342,8 +341,7 @@
         TextView messagePairing = (TextView) view.findViewById(R.id.pairing_code_message);
         CheckBox contactSharing = (CheckBox) view.findViewById(
                 R.id.phonebook_sharing_message_confirm_pin);
-        contactSharing.setText(getString(R.string.bluetooth_pairing_shares_phonebook,
-                mPairingController.getDeviceName()));
+        contactSharing.setText(getString(R.string.bluetooth_pairing_shares_phonebook));
 
         contactSharing.setVisibility(
                 mPairingController.isContactSharingVisible() ? View.VISIBLE : View.GONE);