Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: a858206d61  -s ours
am: 0c91f2120c  -s ours

* commit '0c91f2120c7825074a6331eb153eb45eed5d06b7':
  Import translations. DO NOT MERGE
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 01798c2..c0cf889 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -117,9 +117,6 @@
 
 ART_USE_HSPACE_COMPACT=true
 
-# Include an expanded selection of fonts
-EXTENDED_FONT_FOOTPRINT := true
-
 # let charger mode enter suspend
 BOARD_CHARGER_ENABLE_SUSPEND := true
 
diff --git a/VolantisKeyboard/res/values-az-rAZ/strings.xml b/VolantisKeyboard/res/values-az-rAZ/strings.xml
new file mode 100644
index 0000000..ebd1378
--- /dev/null
+++ b/VolantisKeyboard/res/values-az-rAZ/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="8309373558371161520">"Volantis Klaviaturası"</string>
+    <string name="keyboard_layouts_label" msgid="771692943642467584">"Nexus Yığcam Klaviatura"</string>
+    <string name="keyboard_layout_volantis_english_uk_label" msgid="1425137404576186880">"İngilis (BK)"</string>
+    <string name="keyboard_layout_volantis_english_us_label" msgid="953130059365065614">"İngilis (ABŞ)"</string>
+    <string name="keyboard_layout_volantis_english_us_intl_label" msgid="8444053619141689693">"İngilis (ABŞ Beynəlxalq)"</string>
+    <string name="keyboard_layout_volantis_german_label" msgid="1115175249339065508">"Alman"</string>
+    <string name="keyboard_layout_volantis_french_label" msgid="7039437279465504539">"Fransız"</string>
+    <string name="keyboard_layout_volantis_french_ca_label" msgid="773887798068625483">"Fransız (Kanada)"</string>
+    <string name="keyboard_layout_volantis_italian_label" msgid="2487824389457459330">"İtalyan"</string>
+    <string name="keyboard_layout_volantis_japanese_label" msgid="893728776095514102">"Yapon"</string>
+    <string name="keyboard_layout_volantis_spanish_label" msgid="7072256682329860171">"İspan"</string>
+    <string name="keyboard_layout_volantis_belgian_label" msgid="8875281999639372179">"Belçikalı"</string>
+    <string name="keyboard_layout_volantis_swedish_label" msgid="7072561947207061024">"İsveç"</string>
+    <string name="keyboard_layout_volantis_korean_label" msgid="4119892422942692947">"Koreya"</string>
+    <string name="keyboard_layout_volantis_zhuyin_label" msgid="1056309325803786283">"Çin (Juyin)"</string>
+    <string name="keyboard_layout_volantis_cangjie_label" msgid="4711081327905634320">"Çin (Kanci)"</string>
+</resources>
diff --git a/VolantisKeyboard/res/values-b+sr+Latn/strings.xml b/VolantisKeyboard/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..7e4e6e8
--- /dev/null
+++ b/VolantisKeyboard/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="8309373558371161520">"Volantis tastatura"</string>
+    <string name="keyboard_layouts_label" msgid="771692943642467584">"Nexus kompaktna tastatura"</string>
+    <string name="keyboard_layout_volantis_english_uk_label" msgid="1425137404576186880">"engleska (UK)"</string>
+    <string name="keyboard_layout_volantis_english_us_label" msgid="953130059365065614">"engleska (SAD)"</string>
+    <string name="keyboard_layout_volantis_english_us_intl_label" msgid="8444053619141689693">"engleska (SAD, međunarodna)"</string>
+    <string name="keyboard_layout_volantis_german_label" msgid="1115175249339065508">"nemačka"</string>
+    <string name="keyboard_layout_volantis_french_label" msgid="7039437279465504539">"francuska"</string>
+    <string name="keyboard_layout_volantis_french_ca_label" msgid="773887798068625483">"francuska (Kanada)"</string>
+    <string name="keyboard_layout_volantis_italian_label" msgid="2487824389457459330">"italijanska"</string>
+    <string name="keyboard_layout_volantis_japanese_label" msgid="893728776095514102">"japanska"</string>
+    <string name="keyboard_layout_volantis_spanish_label" msgid="7072256682329860171">"španska"</string>
+    <string name="keyboard_layout_volantis_belgian_label" msgid="8875281999639372179">"belgijska"</string>
+    <string name="keyboard_layout_volantis_swedish_label" msgid="7072561947207061024">"švedska"</string>
+    <string name="keyboard_layout_volantis_korean_label" msgid="4119892422942692947">"korejska"</string>
+    <string name="keyboard_layout_volantis_zhuyin_label" msgid="1056309325803786283">"kineska (žujin)"</string>
+    <string name="keyboard_layout_volantis_cangjie_label" msgid="4711081327905634320">"kineska (čangčije)"</string>
+</resources>
diff --git a/VolantisKeyboard/res/values-gu-rIN/strings.xml b/VolantisKeyboard/res/values-gu-rIN/strings.xml
new file mode 100644
index 0000000..d3d9ce9
--- /dev/null
+++ b/VolantisKeyboard/res/values-gu-rIN/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="8309373558371161520">"વોલનટિઝ કીબોર્ડ"</string>
+    <string name="keyboard_layouts_label" msgid="771692943642467584">"Nexus કોમ્પેક્ટ કીબોર્ડ"</string>
+    <string name="keyboard_layout_volantis_english_uk_label" msgid="1425137404576186880">"અંગ્રેજી (યુકે)"</string>
+    <string name="keyboard_layout_volantis_english_us_label" msgid="953130059365065614">"અંગ્રેજી (યુએસ)"</string>
+    <string name="keyboard_layout_volantis_english_us_intl_label" msgid="8444053619141689693">"અંગ્રેજી (યુએસ આંતરરાષ્ટ્રીય)"</string>
+    <string name="keyboard_layout_volantis_german_label" msgid="1115175249339065508">"જર્મન"</string>
+    <string name="keyboard_layout_volantis_french_label" msgid="7039437279465504539">"ફ્રેન્ચ"</string>
+    <string name="keyboard_layout_volantis_french_ca_label" msgid="773887798068625483">"ફ્રેન્ચ (કેનેડા)"</string>
+    <string name="keyboard_layout_volantis_italian_label" msgid="2487824389457459330">"ઇટાલિયન"</string>
+    <string name="keyboard_layout_volantis_japanese_label" msgid="893728776095514102">"જાપાનીઝ"</string>
+    <string name="keyboard_layout_volantis_spanish_label" msgid="7072256682329860171">"સ્પેનિશ"</string>
+    <string name="keyboard_layout_volantis_belgian_label" msgid="8875281999639372179">"બેલ્જિયન"</string>
+    <string name="keyboard_layout_volantis_swedish_label" msgid="7072561947207061024">"સ્વીડિશ"</string>
+    <string name="keyboard_layout_volantis_korean_label" msgid="4119892422942692947">"કોરિયન"</string>
+    <string name="keyboard_layout_volantis_zhuyin_label" msgid="1056309325803786283">"ચાઇનીઝ (ઝુયિન)"</string>
+    <string name="keyboard_layout_volantis_cangjie_label" msgid="4711081327905634320">"ચાઇનીઝ (કેન્ગજી)"</string>
+</resources>
diff --git a/VolantisKeyboard/res/values-ko/strings.xml b/VolantisKeyboard/res/values-ko/strings.xml
index 0d3803e..dafcddd 100644
--- a/VolantisKeyboard/res/values-ko/strings.xml
+++ b/VolantisKeyboard/res/values-ko/strings.xml
@@ -4,7 +4,7 @@
     <string name="app_label" msgid="8309373558371161520">"볼란티스 키보드"</string>
     <string name="keyboard_layouts_label" msgid="771692943642467584">"Nexus 콤팩트 키보드"</string>
     <string name="keyboard_layout_volantis_english_uk_label" msgid="1425137404576186880">"영어(영국)"</string>
-    <string name="keyboard_layout_volantis_english_us_label" msgid="953130059365065614">"영어(미국)"</string>
+    <string name="keyboard_layout_volantis_english_us_label" msgid="953130059365065614">"영어 (미국)"</string>
     <string name="keyboard_layout_volantis_english_us_intl_label" msgid="8444053619141689693">"영어(미국 국제어)"</string>
     <string name="keyboard_layout_volantis_german_label" msgid="1115175249339065508">"독일어"</string>
     <string name="keyboard_layout_volantis_french_label" msgid="7039437279465504539">"프랑스어"</string>
diff --git a/VolantisKeyboard/res/values-pt-rBR/strings.xml b/VolantisKeyboard/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..8c9f0a9
--- /dev/null
+++ b/VolantisKeyboard/res/values-pt-rBR/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="8309373558371161520">"Teclado Volantis"</string>
+    <string name="keyboard_layouts_label" msgid="771692943642467584">"Teclado compacto do Nexus"</string>
+    <string name="keyboard_layout_volantis_english_uk_label" msgid="1425137404576186880">"Inglês (Reino Unido)"</string>
+    <string name="keyboard_layout_volantis_english_us_label" msgid="953130059365065614">"Inglês (EUA)"</string>
+    <string name="keyboard_layout_volantis_english_us_intl_label" msgid="8444053619141689693">"Inglês (internacional - EUA)"</string>
+    <string name="keyboard_layout_volantis_german_label" msgid="1115175249339065508">"Alemão"</string>
+    <string name="keyboard_layout_volantis_french_label" msgid="7039437279465504539">"Francês"</string>
+    <string name="keyboard_layout_volantis_french_ca_label" msgid="773887798068625483">"Francês (Canadá)"</string>
+    <string name="keyboard_layout_volantis_italian_label" msgid="2487824389457459330">"Italiano"</string>
+    <string name="keyboard_layout_volantis_japanese_label" msgid="893728776095514102">"Japonês"</string>
+    <string name="keyboard_layout_volantis_spanish_label" msgid="7072256682329860171">"Espanhol"</string>
+    <string name="keyboard_layout_volantis_belgian_label" msgid="8875281999639372179">"Belga"</string>
+    <string name="keyboard_layout_volantis_swedish_label" msgid="7072561947207061024">"Sueco"</string>
+    <string name="keyboard_layout_volantis_korean_label" msgid="4119892422942692947">"Coreano"</string>
+    <string name="keyboard_layout_volantis_zhuyin_label" msgid="1056309325803786283">"Chinês (Zhuyin)"</string>
+    <string name="keyboard_layout_volantis_cangjie_label" msgid="4711081327905634320">"Chinês (Cangjie)"</string>
+</resources>
diff --git a/VolantisKeyboard/res/values-sq-rAL/strings.xml b/VolantisKeyboard/res/values-sq-rAL/strings.xml
new file mode 100644
index 0000000..6ac1196
--- /dev/null
+++ b/VolantisKeyboard/res/values-sq-rAL/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="8309373558371161520">"Tastierë \"volantis\""</string>
+    <string name="keyboard_layouts_label" msgid="771692943642467584">"Tastiera kompakte Nexus"</string>
+    <string name="keyboard_layout_volantis_english_uk_label" msgid="1425137404576186880">"anglisht (Mbretëria e Bashkuar)"</string>
+    <string name="keyboard_layout_volantis_english_us_label" msgid="953130059365065614">"anglisht (SHBA)"</string>
+    <string name="keyboard_layout_volantis_english_us_intl_label" msgid="8444053619141689693">"anglisht (ndërkombëtare amerikane)"</string>
+    <string name="keyboard_layout_volantis_german_label" msgid="1115175249339065508">"gjermanisht"</string>
+    <string name="keyboard_layout_volantis_french_label" msgid="7039437279465504539">"frëngjisht"</string>
+    <string name="keyboard_layout_volantis_french_ca_label" msgid="773887798068625483">"franceze (Kanada)"</string>
+    <string name="keyboard_layout_volantis_italian_label" msgid="2487824389457459330">"italisht"</string>
+    <string name="keyboard_layout_volantis_japanese_label" msgid="893728776095514102">"japonisht"</string>
+    <string name="keyboard_layout_volantis_spanish_label" msgid="7072256682329860171">"spanjisht"</string>
+    <string name="keyboard_layout_volantis_belgian_label" msgid="8875281999639372179">"belge"</string>
+    <string name="keyboard_layout_volantis_swedish_label" msgid="7072561947207061024">"suedisht"</string>
+    <string name="keyboard_layout_volantis_korean_label" msgid="4119892422942692947">"koreanisht"</string>
+    <string name="keyboard_layout_volantis_zhuyin_label" msgid="1056309325803786283">"kineze (Zhujin)"</string>
+    <string name="keyboard_layout_volantis_cangjie_label" msgid="4711081327905634320">"kineze (Kanxhi)"</string>
+</resources>
diff --git a/VolantisLayout/res/values-af/strings.xml b/VolantisLayout/res/values-af/strings.xml
index d0e9c00..85abf22 100644
--- a/VolantisLayout/res/values-af/strings.xml
+++ b/VolantisLayout/res/values-af/strings.xml
@@ -19,5 +19,5 @@
     <string name="app_label" msgid="4333089353149619778">"Nexus 9-tuisskerm"</string>
     <string name="google_folder_title" msgid="375890659159312012">"Google"</string>
     <string name="create_folder_title" msgid="5720573466924789097">"Skep"</string>
-    <string name="play_folder_title" msgid="3260420724119064282">"Speel"</string>
+    <string name="play_folder_title" msgid="3260420724119064282">"Play"</string>
 </resources>
diff --git a/VolantisLayout/res/values-am/strings.xml b/VolantisLayout/res/values-am/strings.xml
index ac2663a..3131c70 100644
--- a/VolantisLayout/res/values-am/strings.xml
+++ b/VolantisLayout/res/values-am/strings.xml
@@ -19,5 +19,5 @@
     <string name="app_label" msgid="4333089353149619778">"የNexus 9 መነሻ ማያ ገጽ"</string>
     <string name="google_folder_title" msgid="375890659159312012">"Google"</string>
     <string name="create_folder_title" msgid="5720573466924789097">"ፍጠር"</string>
-    <string name="play_folder_title" msgid="3260420724119064282">"አጫውት"</string>
+    <string name="play_folder_title" msgid="3260420724119064282">"Play"</string>
 </resources>
diff --git a/VolantisLayout/res/values-ar/strings.xml b/VolantisLayout/res/values-ar/strings.xml
index 973b23f..6391271 100644
--- a/VolantisLayout/res/values-ar/strings.xml
+++ b/VolantisLayout/res/values-ar/strings.xml
@@ -19,5 +19,5 @@
     <string name="app_label" msgid="4333089353149619778">"‏شاشة جهاز Nexus 9 الرئيسية"</string>
     <string name="google_folder_title" msgid="375890659159312012">"Google"</string>
     <string name="create_folder_title" msgid="5720573466924789097">"إنشاء"</string>
-    <string name="play_folder_title" msgid="3260420724119064282">"تشغيل"</string>
+    <string name="play_folder_title" msgid="3260420724119064282">"Play"</string>
 </resources>
diff --git a/VolantisLayout/res/values-az-rAZ/strings.xml b/VolantisLayout/res/values-az-rAZ/strings.xml
new file mode 100644
index 0000000..675ff99
--- /dev/null
+++ b/VolantisLayout/res/values-az-rAZ/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 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:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="4333089353149619778">"Nexus 9 Əsas Ekran"</string>
+    <string name="google_folder_title" msgid="375890659159312012">"Google"</string>
+    <string name="create_folder_title" msgid="5720573466924789097">"Yaradın"</string>
+    <string name="play_folder_title" msgid="3260420724119064282">"Play"</string>
+</resources>
diff --git a/VolantisLayout/res/values-b+sr+Latn/strings.xml b/VolantisLayout/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..3fc54e5
--- /dev/null
+++ b/VolantisLayout/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 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:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="4333089353149619778">"Početni ekran Nexus-a 9"</string>
+    <string name="google_folder_title" msgid="375890659159312012">"Google"</string>
+    <string name="create_folder_title" msgid="5720573466924789097">"Pravljenje"</string>
+    <string name="play_folder_title" msgid="3260420724119064282">"Play"</string>
+</resources>
diff --git a/VolantisLayout/res/values-bg/strings.xml b/VolantisLayout/res/values-bg/strings.xml
index ad07260..f85795d 100644
--- a/VolantisLayout/res/values-bg/strings.xml
+++ b/VolantisLayout/res/values-bg/strings.xml
@@ -19,5 +19,5 @@
     <string name="app_label" msgid="4333089353149619778">"Начален екран на Nexus 9"</string>
     <string name="google_folder_title" msgid="375890659159312012">"Googlе"</string>
     <string name="create_folder_title" msgid="5720573466924789097">"Създаване"</string>
-    <string name="play_folder_title" msgid="3260420724119064282">"Google Play"</string>
+    <string name="play_folder_title" msgid="3260420724119064282">"Play"</string>
 </resources>
diff --git a/VolantisLayout/res/values-el/strings.xml b/VolantisLayout/res/values-el/strings.xml
index 182d3bb..8a316ad 100644
--- a/VolantisLayout/res/values-el/strings.xml
+++ b/VolantisLayout/res/values-el/strings.xml
@@ -19,5 +19,5 @@
     <string name="app_label" msgid="4333089353149619778">"Αρχική οθόνη Nexus 9"</string>
     <string name="google_folder_title" msgid="375890659159312012">"Google"</string>
     <string name="create_folder_title" msgid="5720573466924789097">"Δημιουργία"</string>
-    <string name="play_folder_title" msgid="3260420724119064282">"Αναπαραγωγή"</string>
+    <string name="play_folder_title" msgid="3260420724119064282">"Play"</string>
 </resources>
diff --git a/VolantisLayout/res/values-eu-rES/strings.xml b/VolantisLayout/res/values-eu-rES/strings.xml
index 3fd5ce1..9b95862 100644
--- a/VolantisLayout/res/values-eu-rES/strings.xml
+++ b/VolantisLayout/res/values-eu-rES/strings.xml
@@ -19,5 +19,5 @@
     <string name="app_label" msgid="4333089353149619778">"Nexus 9 hasierako pantaila"</string>
     <string name="google_folder_title" msgid="375890659159312012">"Google"</string>
     <string name="create_folder_title" msgid="5720573466924789097">"Sortu"</string>
-    <string name="play_folder_title" msgid="3260420724119064282">"Erreproduzitu"</string>
+    <string name="play_folder_title" msgid="3260420724119064282">"Play"</string>
 </resources>
diff --git a/VolantisLayout/res/values-fi/strings.xml b/VolantisLayout/res/values-fi/strings.xml
index d0696bf..537f0c3 100644
--- a/VolantisLayout/res/values-fi/strings.xml
+++ b/VolantisLayout/res/values-fi/strings.xml
@@ -19,5 +19,5 @@
     <string name="app_label" msgid="4333089353149619778">"Nexus 9:n aloitusruutu"</string>
     <string name="google_folder_title" msgid="375890659159312012">"Google"</string>
     <string name="create_folder_title" msgid="5720573466924789097">"Luo"</string>
-    <string name="play_folder_title" msgid="3260420724119064282">"Toista"</string>
+    <string name="play_folder_title" msgid="3260420724119064282">"Play"</string>
 </resources>
diff --git a/VolantisLayout/res/values-fr-rCA/strings.xml b/VolantisLayout/res/values-fr-rCA/strings.xml
index 2ce651a..42d2c9d 100644
--- a/VolantisLayout/res/values-fr-rCA/strings.xml
+++ b/VolantisLayout/res/values-fr-rCA/strings.xml
@@ -19,5 +19,5 @@
     <string name="app_label" msgid="4333089353149619778">"Écran d\'accueil de la Nexus 9"</string>
     <string name="google_folder_title" msgid="375890659159312012">"Google"</string>
     <string name="create_folder_title" msgid="5720573466924789097">"Créer"</string>
-    <string name="play_folder_title" msgid="3260420724119064282">"Lecture"</string>
+    <string name="play_folder_title" msgid="3260420724119064282">"Play"</string>
 </resources>
diff --git a/VolantisLayout/res/values-gu-rIN/strings.xml b/VolantisLayout/res/values-gu-rIN/strings.xml
new file mode 100644
index 0000000..1caf78d
--- /dev/null
+++ b/VolantisLayout/res/values-gu-rIN/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 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:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="4333089353149619778">"Nexus 9 હોમ સ્ક્રીન"</string>
+    <string name="google_folder_title" msgid="375890659159312012">"Google"</string>
+    <string name="create_folder_title" msgid="5720573466924789097">"બનાવો"</string>
+    <string name="play_folder_title" msgid="3260420724119064282">"Play"</string>
+</resources>
diff --git a/VolantisLayout/res/values-hu/strings.xml b/VolantisLayout/res/values-hu/strings.xml
index dd3b691..2dde3e5 100644
--- a/VolantisLayout/res/values-hu/strings.xml
+++ b/VolantisLayout/res/values-hu/strings.xml
@@ -19,5 +19,5 @@
     <string name="app_label" msgid="4333089353149619778">"Nexus 9 kezdőképernyője"</string>
     <string name="google_folder_title" msgid="375890659159312012">"Google"</string>
     <string name="create_folder_title" msgid="5720573466924789097">"Létrehozás"</string>
-    <string name="play_folder_title" msgid="3260420724119064282">"Lejátszás"</string>
+    <string name="play_folder_title" msgid="3260420724119064282">"Play"</string>
 </resources>
diff --git a/VolantisLayout/res/values-in/strings.xml b/VolantisLayout/res/values-in/strings.xml
index e9ca0c5..df9216e 100644
--- a/VolantisLayout/res/values-in/strings.xml
+++ b/VolantisLayout/res/values-in/strings.xml
@@ -19,5 +19,5 @@
     <string name="app_label" msgid="4333089353149619778">"Layar Utama Nexus 9"</string>
     <string name="google_folder_title" msgid="375890659159312012">"Google"</string>
     <string name="create_folder_title" msgid="5720573466924789097">"Buat"</string>
-    <string name="play_folder_title" msgid="3260420724119064282">"Putar"</string>
+    <string name="play_folder_title" msgid="3260420724119064282">"Play"</string>
 </resources>
diff --git a/VolantisLayout/res/values-ka-rGE/strings.xml b/VolantisLayout/res/values-ka-rGE/strings.xml
index 4496306..20535c0 100644
--- a/VolantisLayout/res/values-ka-rGE/strings.xml
+++ b/VolantisLayout/res/values-ka-rGE/strings.xml
@@ -19,5 +19,5 @@
     <string name="app_label" msgid="4333089353149619778">"Nexus 9 მთავარი ეკრანი"</string>
     <string name="google_folder_title" msgid="375890659159312012">"Google"</string>
     <string name="create_folder_title" msgid="5720573466924789097">"შექმნა"</string>
-    <string name="play_folder_title" msgid="3260420724119064282">"დაკვრა"</string>
+    <string name="play_folder_title" msgid="3260420724119064282">"Play"</string>
 </resources>
diff --git a/VolantisLayout/res/values-kk-rKZ/strings.xml b/VolantisLayout/res/values-kk-rKZ/strings.xml
index dd2b67f..5d80104 100644
--- a/VolantisLayout/res/values-kk-rKZ/strings.xml
+++ b/VolantisLayout/res/values-kk-rKZ/strings.xml
@@ -19,5 +19,5 @@
     <string name="app_label" msgid="4333089353149619778">"Nexus 9 негізгі экраны"</string>
     <string name="google_folder_title" msgid="375890659159312012">"Google"</string>
     <string name="create_folder_title" msgid="5720573466924789097">"Жасау"</string>
-    <string name="play_folder_title" msgid="3260420724119064282">"Ойнату"</string>
+    <string name="play_folder_title" msgid="3260420724119064282">"Play"</string>
 </resources>
diff --git a/VolantisLayout/res/values-km-rKH/strings.xml b/VolantisLayout/res/values-km-rKH/strings.xml
index 8497941..c77ccb1 100644
--- a/VolantisLayout/res/values-km-rKH/strings.xml
+++ b/VolantisLayout/res/values-km-rKH/strings.xml
@@ -19,5 +19,5 @@
     <string name="app_label" msgid="4333089353149619778">"អេក្រង់​ដើម Nexus 9"</string>
     <string name="google_folder_title" msgid="375890659159312012">"Google"</string>
     <string name="create_folder_title" msgid="5720573466924789097">"បង្កើត"</string>
-    <string name="play_folder_title" msgid="3260420724119064282">"ចាក់"</string>
+    <string name="play_folder_title" msgid="3260420724119064282">"Play"</string>
 </resources>
diff --git a/VolantisLayout/res/values-kn-rIN/strings.xml b/VolantisLayout/res/values-kn-rIN/strings.xml
index 84cb50e..a86c8e2 100644
--- a/VolantisLayout/res/values-kn-rIN/strings.xml
+++ b/VolantisLayout/res/values-kn-rIN/strings.xml
@@ -19,5 +19,5 @@
     <string name="app_label" msgid="4333089353149619778">"Nexus 9 ಮುಖಪುಟದ ಪರದೆ"</string>
     <string name="google_folder_title" msgid="375890659159312012">"Google"</string>
     <string name="create_folder_title" msgid="5720573466924789097">"ರಚಿಸಿ"</string>
-    <string name="play_folder_title" msgid="3260420724119064282">"ಪ್ಲೇ ಮಾಡು"</string>
+    <string name="play_folder_title" msgid="3260420724119064282">"Play"</string>
 </resources>
diff --git a/VolantisLayout/res/values-ky-rKG/strings.xml b/VolantisLayout/res/values-ky-rKG/strings.xml
index 2e40b71..e0a1af9 100644
--- a/VolantisLayout/res/values-ky-rKG/strings.xml
+++ b/VolantisLayout/res/values-ky-rKG/strings.xml
@@ -19,5 +19,5 @@
     <string name="app_label" msgid="4333089353149619778">"Nexus 9 Башкы экраны"</string>
     <string name="google_folder_title" msgid="375890659159312012">"Google"</string>
     <string name="create_folder_title" msgid="5720573466924789097">"Түзүү"</string>
-    <string name="play_folder_title" msgid="3260420724119064282">"Ойнотуу"</string>
+    <string name="play_folder_title" msgid="3260420724119064282">"Play"</string>
 </resources>
diff --git a/VolantisLayout/res/values-lt/strings.xml b/VolantisLayout/res/values-lt/strings.xml
index 56cc53e..f220602 100644
--- a/VolantisLayout/res/values-lt/strings.xml
+++ b/VolantisLayout/res/values-lt/strings.xml
@@ -19,5 +19,5 @@
     <string name="app_label" msgid="4333089353149619778">"Pagrindinis „Nexus 9“ ekranas"</string>
     <string name="google_folder_title" msgid="375890659159312012">"Google"</string>
     <string name="create_folder_title" msgid="5720573466924789097">"Sukurti"</string>
-    <string name="play_folder_title" msgid="3260420724119064282">"Google Play"</string>
+    <string name="play_folder_title" msgid="3260420724119064282">"Play"</string>
 </resources>
diff --git a/VolantisLayout/res/values-mk-rMK/strings.xml b/VolantisLayout/res/values-mk-rMK/strings.xml
index 93d1953..86a1239 100644
--- a/VolantisLayout/res/values-mk-rMK/strings.xml
+++ b/VolantisLayout/res/values-mk-rMK/strings.xml
@@ -19,5 +19,5 @@
     <string name="app_label" msgid="4333089353149619778">"Почетен екран на Nexus 9"</string>
     <string name="google_folder_title" msgid="375890659159312012">"Google"</string>
     <string name="create_folder_title" msgid="5720573466924789097">"Создај"</string>
-    <string name="play_folder_title" msgid="3260420724119064282">"Пушти"</string>
+    <string name="play_folder_title" msgid="3260420724119064282">"Play"</string>
 </resources>
diff --git a/VolantisLayout/res/values-mn-rMN/strings.xml b/VolantisLayout/res/values-mn-rMN/strings.xml
index 99e14dd..b913392 100644
--- a/VolantisLayout/res/values-mn-rMN/strings.xml
+++ b/VolantisLayout/res/values-mn-rMN/strings.xml
@@ -19,5 +19,5 @@
     <string name="app_label" msgid="4333089353149619778">"Nexus 9 Үндсэн дэлгэц"</string>
     <string name="google_folder_title" msgid="375890659159312012">"Google"</string>
     <string name="create_folder_title" msgid="5720573466924789097">"Үүсгэх"</string>
-    <string name="play_folder_title" msgid="3260420724119064282">"Тоглуулах"</string>
+    <string name="play_folder_title" msgid="3260420724119064282">"Play"</string>
 </resources>
diff --git a/VolantisLayout/res/values-mr-rIN/strings.xml b/VolantisLayout/res/values-mr-rIN/strings.xml
index 772fd69..6d89d30 100644
--- a/VolantisLayout/res/values-mr-rIN/strings.xml
+++ b/VolantisLayout/res/values-mr-rIN/strings.xml
@@ -19,5 +19,5 @@
     <string name="app_label" msgid="4333089353149619778">"Nexus 9 मुख्य स्क्रीन"</string>
     <string name="google_folder_title" msgid="375890659159312012">"Google"</string>
     <string name="create_folder_title" msgid="5720573466924789097">"तयार करा"</string>
-    <string name="play_folder_title" msgid="3260420724119064282">"प्ले करा"</string>
+    <string name="play_folder_title" msgid="3260420724119064282">"Play"</string>
 </resources>
diff --git a/VolantisLayout/res/values-my-rMM/strings.xml b/VolantisLayout/res/values-my-rMM/strings.xml
index 88c04f7..14242c4 100644
--- a/VolantisLayout/res/values-my-rMM/strings.xml
+++ b/VolantisLayout/res/values-my-rMM/strings.xml
@@ -19,5 +19,5 @@
     <string name="app_label" msgid="4333089353149619778">"Nexus 9 ပင်မ စာမျက်နှာ"</string>
     <string name="google_folder_title" msgid="375890659159312012">"Google"</string>
     <string name="create_folder_title" msgid="5720573466924789097">"ဖန်တီးရန်"</string>
-    <string name="play_folder_title" msgid="3260420724119064282">"ဖွင့်ရန်"</string>
+    <string name="play_folder_title" msgid="3260420724119064282">"Play"</string>
 </resources>
diff --git a/VolantisLayout/res/values-nb/strings.xml b/VolantisLayout/res/values-nb/strings.xml
index 95d233d..af55014 100644
--- a/VolantisLayout/res/values-nb/strings.xml
+++ b/VolantisLayout/res/values-nb/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="4333089353149619778">"Startside for Nexus 9"</string>
-    <string name="google_folder_title" msgid="375890659159312012">"Google-apper"</string>
+    <string name="google_folder_title" msgid="375890659159312012">"Google"</string>
     <string name="create_folder_title" msgid="5720573466924789097">"Opprett"</string>
-    <string name="play_folder_title" msgid="3260420724119064282">"Spill av"</string>
+    <string name="play_folder_title" msgid="3260420724119064282">"Play"</string>
 </resources>
diff --git a/VolantisLayout/res/values-ne-rNP/strings.xml b/VolantisLayout/res/values-ne-rNP/strings.xml
index 37ed751..a09aca0 100644
--- a/VolantisLayout/res/values-ne-rNP/strings.xml
+++ b/VolantisLayout/res/values-ne-rNP/strings.xml
@@ -19,5 +19,5 @@
     <string name="app_label" msgid="4333089353149619778">"नेक्सस ९ गृह स्क्रिन"</string>
     <string name="google_folder_title" msgid="375890659159312012">"Google"</string>
     <string name="create_folder_title" msgid="5720573466924789097">"सिर्जना गर्नुहोस्"</string>
-    <string name="play_folder_title" msgid="3260420724119064282">"बजाउनुहोस्"</string>
+    <string name="play_folder_title" msgid="3260420724119064282">"Play"</string>
 </resources>
diff --git a/VolantisLayout/res/values-nl/strings.xml b/VolantisLayout/res/values-nl/strings.xml
index 72245c7..cf0f014 100644
--- a/VolantisLayout/res/values-nl/strings.xml
+++ b/VolantisLayout/res/values-nl/strings.xml
@@ -19,5 +19,5 @@
     <string name="app_label" msgid="4333089353149619778">"Nexus 9-startscherm"</string>
     <string name="google_folder_title" msgid="375890659159312012">"Google"</string>
     <string name="create_folder_title" msgid="5720573466924789097">"Maken"</string>
-    <string name="play_folder_title" msgid="3260420724119064282">"Google Play"</string>
+    <string name="play_folder_title" msgid="3260420724119064282">"Play"</string>
 </resources>
diff --git a/VolantisLayout/res/values-pa-rIN/strings.xml b/VolantisLayout/res/values-pa-rIN/strings.xml
index 7c26586..b6bf0af 100644
--- a/VolantisLayout/res/values-pa-rIN/strings.xml
+++ b/VolantisLayout/res/values-pa-rIN/strings.xml
@@ -19,5 +19,5 @@
     <string name="app_label" msgid="4333089353149619778">"Nexus 9 ਹੋਮ ਸਕ੍ਰੀਨ"</string>
     <string name="google_folder_title" msgid="375890659159312012">"Google"</string>
     <string name="create_folder_title" msgid="5720573466924789097">"ਬਣਾਓ"</string>
-    <string name="play_folder_title" msgid="3260420724119064282">"ਪਲੇ ਕਰੋ"</string>
+    <string name="play_folder_title" msgid="3260420724119064282">"Play"</string>
 </resources>
diff --git a/VolantisLayout/res/values-pt-rBR/strings.xml b/VolantisLayout/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..cebb9ea
--- /dev/null
+++ b/VolantisLayout/res/values-pt-rBR/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 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:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="4333089353149619778">"Tela inicial do Nexus 9"</string>
+    <string name="google_folder_title" msgid="375890659159312012">"Google"</string>
+    <string name="create_folder_title" msgid="5720573466924789097">"Criar"</string>
+    <string name="play_folder_title" msgid="3260420724119064282">"Play"</string>
+</resources>
diff --git a/VolantisLayout/res/values-ro/strings.xml b/VolantisLayout/res/values-ro/strings.xml
index 9bec3bd..7cee53a 100644
--- a/VolantisLayout/res/values-ro/strings.xml
+++ b/VolantisLayout/res/values-ro/strings.xml
@@ -19,5 +19,5 @@
     <string name="app_label" msgid="4333089353149619778">"Ecranul de pornire Nexus 9"</string>
     <string name="google_folder_title" msgid="375890659159312012">"Google"</string>
     <string name="create_folder_title" msgid="5720573466924789097">"Creați"</string>
-    <string name="play_folder_title" msgid="3260420724119064282">"Redați"</string>
+    <string name="play_folder_title" msgid="3260420724119064282">"Play"</string>
 </resources>
diff --git a/VolantisLayout/res/values-ru/strings.xml b/VolantisLayout/res/values-ru/strings.xml
index f5cac9d..ca2f33e 100644
--- a/VolantisLayout/res/values-ru/strings.xml
+++ b/VolantisLayout/res/values-ru/strings.xml
@@ -19,5 +19,5 @@
     <string name="app_label" msgid="4333089353149619778">"Главный экран Nexus 9"</string>
     <string name="google_folder_title" msgid="375890659159312012">"Google"</string>
     <string name="create_folder_title" msgid="5720573466924789097">"Создать"</string>
-    <string name="play_folder_title" msgid="3260420724119064282">"Google Play"</string>
+    <string name="play_folder_title" msgid="3260420724119064282">"Play"</string>
 </resources>
diff --git a/VolantisLayout/res/values-si-rLK/strings.xml b/VolantisLayout/res/values-si-rLK/strings.xml
index 2831e43..16c3a5f 100644
--- a/VolantisLayout/res/values-si-rLK/strings.xml
+++ b/VolantisLayout/res/values-si-rLK/strings.xml
@@ -19,5 +19,5 @@
     <string name="app_label" msgid="4333089353149619778">"Nexus 9 මුල් තිරය"</string>
     <string name="google_folder_title" msgid="375890659159312012">"Google"</string>
     <string name="create_folder_title" msgid="5720573466924789097">"සාදන්න"</string>
-    <string name="play_folder_title" msgid="3260420724119064282">"ධාවනය කරන්න"</string>
+    <string name="play_folder_title" msgid="3260420724119064282">"Play"</string>
 </resources>
diff --git a/VolantisLayout/res/values-sl/strings.xml b/VolantisLayout/res/values-sl/strings.xml
index 2375091..3734e0c 100644
--- a/VolantisLayout/res/values-sl/strings.xml
+++ b/VolantisLayout/res/values-sl/strings.xml
@@ -19,5 +19,5 @@
     <string name="app_label" msgid="4333089353149619778">"Začetni zaslon Nexusa 9"</string>
     <string name="google_folder_title" msgid="375890659159312012">"Google"</string>
     <string name="create_folder_title" msgid="5720573466924789097">"Ustvarjanje"</string>
-    <string name="play_folder_title" msgid="3260420724119064282">"Google Play"</string>
+    <string name="play_folder_title" msgid="3260420724119064282">"Play"</string>
 </resources>
diff --git a/VolantisLayout/res/values-sq-rAL/strings.xml b/VolantisLayout/res/values-sq-rAL/strings.xml
new file mode 100644
index 0000000..923e5a9
--- /dev/null
+++ b/VolantisLayout/res/values-sq-rAL/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 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:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="4333089353149619778">"Ekrani bazë i Nexus 9"</string>
+    <string name="google_folder_title" msgid="375890659159312012">"Google"</string>
+    <string name="create_folder_title" msgid="5720573466924789097">"Krijo"</string>
+    <string name="play_folder_title" msgid="3260420724119064282">"Play"</string>
+</resources>
diff --git a/VolantisLayout/res/values-sv/strings.xml b/VolantisLayout/res/values-sv/strings.xml
index cacf610..fafd203 100644
--- a/VolantisLayout/res/values-sv/strings.xml
+++ b/VolantisLayout/res/values-sv/strings.xml
@@ -19,5 +19,5 @@
     <string name="app_label" msgid="4333089353149619778">"Startskärm för Nexus 9"</string>
     <string name="google_folder_title" msgid="375890659159312012">"Google"</string>
     <string name="create_folder_title" msgid="5720573466924789097">"Skapa"</string>
-    <string name="play_folder_title" msgid="3260420724119064282">"Spela upp"</string>
+    <string name="play_folder_title" msgid="3260420724119064282">"Play"</string>
 </resources>
diff --git a/VolantisLayout/res/values-sw/strings.xml b/VolantisLayout/res/values-sw/strings.xml
index c1c278a..6e53224 100644
--- a/VolantisLayout/res/values-sw/strings.xml
+++ b/VolantisLayout/res/values-sw/strings.xml
@@ -19,5 +19,5 @@
     <string name="app_label" msgid="4333089353149619778">"Skrini ya Kwanza ya Nexus 9"</string>
     <string name="google_folder_title" msgid="375890659159312012">"Google"</string>
     <string name="create_folder_title" msgid="5720573466924789097">"Unda"</string>
-    <string name="play_folder_title" msgid="3260420724119064282">"Google Play"</string>
+    <string name="play_folder_title" msgid="3260420724119064282">"Play"</string>
 </resources>
diff --git a/VolantisLayout/res/values-tr/strings.xml b/VolantisLayout/res/values-tr/strings.xml
index d98679d..e9dde95 100644
--- a/VolantisLayout/res/values-tr/strings.xml
+++ b/VolantisLayout/res/values-tr/strings.xml
@@ -19,5 +19,5 @@
     <string name="app_label" msgid="4333089353149619778">"Nexus 9 Ana Ekranı"</string>
     <string name="google_folder_title" msgid="375890659159312012">"Google"</string>
     <string name="create_folder_title" msgid="5720573466924789097">"Oluştur"</string>
-    <string name="play_folder_title" msgid="3260420724119064282">"Google Play"</string>
+    <string name="play_folder_title" msgid="3260420724119064282">"Play"</string>
 </resources>
diff --git a/VolantisLayout/res/values-zh-rHK/strings.xml b/VolantisLayout/res/values-zh-rHK/strings.xml
index 50f07d5..261efe3 100644
--- a/VolantisLayout/res/values-zh-rHK/strings.xml
+++ b/VolantisLayout/res/values-zh-rHK/strings.xml
@@ -19,5 +19,5 @@
     <string name="app_label" msgid="4333089353149619778">"Nexus 9 主螢幕"</string>
     <string name="google_folder_title" msgid="375890659159312012">"Google"</string>
     <string name="create_folder_title" msgid="5720573466924789097">"建立"</string>
-    <string name="play_folder_title" msgid="3260420724119064282">"播放"</string>
+    <string name="play_folder_title" msgid="3260420724119064282">"Play"</string>
 </resources>
diff --git a/VolantisLayout/res/values-zu/strings.xml b/VolantisLayout/res/values-zu/strings.xml
index 56ab44d..03d3b82 100644
--- a/VolantisLayout/res/values-zu/strings.xml
+++ b/VolantisLayout/res/values-zu/strings.xml
@@ -19,5 +19,5 @@
     <string name="app_label" msgid="4333089353149619778">"Isikrini Sasekhaya se-Nexus 9"</string>
     <string name="google_folder_title" msgid="375890659159312012">"I-Google"</string>
     <string name="create_folder_title" msgid="5720573466924789097">"Dala"</string>
-    <string name="play_folder_title" msgid="3260420724119064282">"Dlala"</string>
+    <string name="play_folder_title" msgid="3260420724119064282">"Play"</string>
 </resources>
diff --git a/device.mk b/device.mk
index 5511410..f040b2a 100644
--- a/device.mk
+++ b/device.mk
@@ -167,7 +167,7 @@
     device/htc/flounder/nfc/libnfc-brcm.conf:system/etc/libnfc-brcm.conf \
     device/htc/flounder/nfc/libnfc-brcm-20795a10.conf:system/etc/libnfc-brcm-20795a10.conf
 
-PRODUCT_AAPT_CONFIG := normal large xlarge hdpi xhdpi xxhdpi
+PRODUCT_AAPT_CONFIG := normal large xlarge
 PRODUCT_AAPT_PREF_CONFIG := xhdpi
 
 PRODUCT_CHARACTERISTICS := tablet,nosdcard
diff --git a/init.flounder.rc b/init.flounder.rc
index 11c6c3b..66c57e7 100644
--- a/init.flounder.rc
+++ b/init.flounder.rc
@@ -14,15 +14,18 @@
     symlink /sdcard /mnt/sdcard
     symlink /sdcard /storage/sdcard0
 
+    write /sys/block/zram0/comp_algorithm lz4
+    write /sys/block/zram0/max_comp_streams 2
+
+    # Swap in only 1 page at a time
+    write /proc/sys/vm/page-cluster 0
+
 on post-fs
     write /sys/power/gpu_power_on 1
     write /sys/module/input_cfboost/parameters/gpu_wakeup 1
     # Turn on swap
     swapon_all /fstab.flounder
 
-    # Swap in only 1 page at a time
-    write /proc/sys/vm/page-cluster 0
-
 on post-fs-data
     # Now that are booted all the way and out of mount panics, ensure that we panic on later errors.
     # This is a hack to work around the fact that we can't recover from all errors that would lead to a panic
@@ -30,7 +33,12 @@
     # For a remount only the flags and the target mount point are relevant.
     mount dummy dummy /data remount nosuid nodev noatime rw seclabel,background_gc=on,user_xattr,acl,errors=panic
 
-    mkdir /data/nvcam 0700 media camera
+    # Previously files in /data/nvcam are owned by media, change the owner to cameraserver so it
+    # can be accessed by Camera HAL in cameraserver.
+    chown cameraserver camera /data/nvcam/factory_copy_0.bin
+    chown cameraserver camera /data/nvcam/nvcam_cache_0.bin
+    chown cameraserver camera /data/nvcam/nvcam_cache_1.bin
+    mkdir /data/nvcam 0700 cameraserver camera
 
     # NFC: create data/nfc for nv storage
     mkdir /data/nfc 0770 nfc nfc
@@ -109,14 +117,14 @@
 
 on fs
     mount_all /fstab.flounder
+    write /sys/module/dm_verity/parameters/prefetch_cluster 524288
+    # Update dm-verity state and set partition.*.verified properties
+    verity_update_state
 
+on property:service.bootanim.exit=1
     # Adjust parameters for dm-verity devices
     write /sys/block/dm-0/queue/read_ahead_kb 2048
     write /sys/block/dm-1/queue/read_ahead_kb 2048
-    write /sys/module/dm_verity/parameters/prefetch_cluster 524288
-
-    # Update dm-verity state and set partition.*.verified properties
-    verity_update_state
 
 on verity-logging
     exec u:r:slideshow:s0 -- /sbin/slideshow warning/verity_red_1 warning/verity_red_2
@@ -189,7 +197,7 @@
     write /sys/devices/system/cpu/cpufreq/interactive/rt_priority 1
 
 # bugreport is triggered by holding down volume down, volume up and power
-service bugreport /system/bin/dumpstate -d -p -B \
+service bugreport /system/bin/dumpstate -d -p -B -z \
         -o /data/data/com.android.shell/files/bugreports/bugreport
     class late_start
     disabled
diff --git a/sepolicy/audioserver.te b/sepolicy/audioserver.te
new file mode 100644
index 0000000..d9bb350
--- /dev/null
+++ b/sepolicy/audioserver.te
@@ -0,0 +1,3 @@
+allow audioserver system_server:unix_stream_socket { read write };
+allow audioserver self:netlink_kobject_uevent_socket create_socket_perms;
+allow audioserver sensorservice_service:service_manager find;
diff --git a/sepolicy/cameraserver.te b/sepolicy/cameraserver.te
new file mode 100644
index 0000000..f7366a5
--- /dev/null
+++ b/sepolicy/cameraserver.te
@@ -0,0 +1,4 @@
+allow cameraserver system_server:unix_stream_socket { read write };
+allow cameraserver self:netlink_kobject_uevent_socket create_socket_perms;
+allow cameraserver sensorservice_service:service_manager find;
+allow cameraserver sysfs_gpu:file r_file_perms;
\ No newline at end of file
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index db90525..b8dc5f6 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -35,7 +35,7 @@
 /dev/tfa9895l                   u:object_r:audio_device:s0
 
 /data/nfc(/.*)?			u:object_r:nfc_data_file:s0
-/data/nvcam(/.*)?		u:object_r:media_data_file:s0
+/data/nvcam(/.*)?		u:object_r:camera_data_file:s0
 
 # gps
 /system/bin/glgps		u:object_r:gpsd_exec:s0