diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index d671226..c87fbd1 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -2,7 +2,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="system_tracing" msgid="4719188511746319848">"ছিষ্টেম ট্ৰে\'চ কৰা কাৰ্য"</string>
-    <string name="record_system_activity" msgid="4339462312915377825">"ছিষ্টেমৰ কাৰ্যকলাপ ৰেকৰ্ড কৰক আৰু ইয়াৰ প্ৰদৰ্শন আৰু উন্নত কৰিবলৈ পিছত ইয়াৰ বিশ্লেষণ কৰক"</string>
+    <string name="record_system_activity" msgid="4339462312915377825">"ছিষ্টেমৰ কাৰ্যকলাপ ৰেকৰ্ড কৰক আৰু ইয়াৰ প্ৰদৰ্শন আৰু উন্নত কৰিবলৈ পাছত ইয়াৰ বিশ্লেষণ কৰক"</string>
     <string name="record_trace" msgid="6416875085186661845">"ট্ৰে\'চ ৰেকৰ্ড কৰক"</string>
     <string name="start_new_trace" msgid="8177130420802170353">"নতুন ট্ৰে’চ আৰম্ভ কৰক"</string>
     <string name="trace_debuggable_applications" msgid="7957069895298887899">"ডিবাগ কৰিবলগীয়া এপ্লিকেশ্বনসমূহ ট্ৰে\'চ কৰক"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index a57b35e..35801c7 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -2,7 +2,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="system_tracing" msgid="4719188511746319848">"System Tracing"</string>
-    <string name="record_system_activity" msgid="4339462312915377825">"Record system activity and analyse it later to improve performance"</string>
+    <string name="record_system_activity" msgid="4339462312915377825">"Record system activity and analyze it later to improve performance"</string>
     <string name="record_trace" msgid="6416875085186661845">"Record trace"</string>
     <string name="start_new_trace" msgid="8177130420802170353">"Start new trace"</string>
     <string name="trace_debuggable_applications" msgid="7957069895298887899">"Trace debuggable applications"</string>
@@ -14,7 +14,7 @@
     <string name="applications" msgid="521776761270770549">"Applications"</string>
     <string name="no_debuggable_apps" msgid="4386209254520471208">"No debuggable applications are available"</string>
     <string name="buffer_size" msgid="3944311026715111454">"Per-CPU buffer size"</string>
-    <string name="show_quick_settings_tile" msgid="4971147332635291585">"Show quick settings tile"</string>
+    <string name="show_quick_settings_tile" msgid="4971147332635291585">"Show Quick Settings tile"</string>
     <string name="saving_trace" msgid="1468692734770800541">"Saving trace"</string>
     <string name="trace_saved" msgid="5869970594780992309">"Trace saved"</string>
     <string name="tap_to_share" msgid="6766732404489536899">"Tap to share your trace"</string>
@@ -33,7 +33,7 @@
     <string name="system_traces_storage_title" msgid="8294090839883366871">"System traces"</string>
     <string name="keywords" msgid="736547007949049535">"systrace, trace, performance"</string>
     <string name="share_trace" msgid="4528525067822044385">"Share trace?"</string>
-    <string name="system_trace_sensitive_data" msgid="3069389866696009549">"System tracing files may include sensitive system and app data (such as app usage). Only share system traces with people and apps that you trust."</string>
+    <string name="system_trace_sensitive_data" msgid="3069389866696009549">"System Tracing files may include sensitive system and app data (such as app usage). Only share system traces with people and apps you trust."</string>
     <string name="share" msgid="8443979083706282338">"Share"</string>
     <string name="dont_show_again" msgid="6662492041164390600">"Don\'t show again"</string>
     <string name="use_perfetto_beta" msgid="2725630143916520160">"Use Perfetto (beta)"</string>
@@ -59,7 +59,7 @@
     <string name="thirtytwo_thousand_kb" msgid="654328198799196150">"32768 KB"</string>
     <string name="sixtyfive_thousand_kb" msgid="8168144138598305306">"65536 KB"</string>
     <string name="stop_on_bugreport" msgid="2045328149107284734">"Stop tracing for bug reports"</string>
-    <string name="stop_on_bugreport_summary" msgid="7844074306038850040">"Ends active trace recordings when a bug report is started"</string>
+    <string name="stop_on_bugreport_summary" msgid="7844074306038850040">"Ends active trace recordings when a bugreport is started"</string>
     <string name="attach_to_bug_report" msgid="2953745117960948415">"Attach traces to bug reports"</string>
     <string name="attach_to_bug_report_summary" msgid="2225208904634565377">"Automatically send in-progress traces to BetterBug when a bug report is collected"</string>
     <string name="link_to_traces" msgid="6569969595898995517">"View trace files"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 48331b5..f111482 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -14,7 +14,7 @@
     <string name="applications" msgid="521776761270770549">"برنامه‌ها"</string>
     <string name="no_debuggable_apps" msgid="4386209254520471208">"هیچ برنامه‌ای با قابلیت اشکال‌زدایی در دسترس نیست"</string>
     <string name="buffer_size" msgid="3944311026715111454">"‏اندازه بافر Per-CPU"</string>
-    <string name="show_quick_settings_tile" msgid="4971147332635291585">"نمایش کاشی تنظیمات سریع"</string>
+    <string name="show_quick_settings_tile" msgid="4971147332635291585">"نمایش کاشی «تنظیمات فوری»"</string>
     <string name="saving_trace" msgid="1468692734770800541">"درحال ذخیره کردن رد"</string>
     <string name="trace_saved" msgid="5869970594780992309">"رد ذخیره شد"</string>
     <string name="tap_to_share" msgid="6766732404489536899">"برای هم‌رسانی ردتان، ضربه بزنید"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index f83066f..5df1390 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -14,7 +14,7 @@
     <string name="applications" msgid="521776761270770549">"Aplicacións"</string>
     <string name="no_debuggable_apps" msgid="4386209254520471208">"Non hai ningunha aplicación que se poida depurar dispoñible"</string>
     <string name="buffer_size" msgid="3944311026715111454">"Tamaño do búfer por CPU"</string>
-    <string name="show_quick_settings_tile" msgid="4971147332635291585">"Mostrar atallo de configuración rápida"</string>
+    <string name="show_quick_settings_tile" msgid="4971147332635291585">"Mostrar atallo de Configuración rápida"</string>
     <string name="saving_trace" msgid="1468692734770800541">"Gardando rastro"</string>
     <string name="trace_saved" msgid="5869970594780992309">"Gardouse o rastro"</string>
     <string name="tap_to_share" msgid="6766732404489536899">"Toca para compartir o teu rastro"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 102200b..dd21ed7 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -10,7 +10,7 @@
     <string name="restore_default_categories" msgid="5090536794637169521">"שחזור קטגוריות המוגדרות כברירת מחדל"</string>
     <string name="default_categories_restored" msgid="6861683793680564181">"שוחזרו הקטגוריות שמוגדרות כברירת המחדל"</string>
     <string name="default_categories" msgid="2117679794687799407">"ברירת מחדל"</string>
-    <string name="num_categories_selected" msgid="5772630335027553995">"{count,plural, =1{נבחרה קטגוריה אחת}two{נבחרו # קטגוריות}many{נבחרו # קטגוריות}other{נבחרו # קטגוריות}}"</string>
+    <string name="num_categories_selected" msgid="5772630335027553995">"{count,plural, =1{נבחרה קטגוריה אחת}one{נבחרו # קטגוריות}two{נבחרו # קטגוריות}other{נבחרו # קטגוריות}}"</string>
     <string name="applications" msgid="521776761270770549">"אפליקציות"</string>
     <string name="no_debuggable_apps" msgid="4386209254520471208">"אין אפליקציות שניתן לנפות בהן באגים"</string>
     <string name="buffer_size" msgid="3944311026715111454">"‏שטח אחסון זמני לכל יחידת עיבוד מרכזית (CPU)"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index f84e9a6..54a4753 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -14,7 +14,7 @@
     <string name="applications" msgid="521776761270770549">"Колдонмолор"</string>
     <string name="no_debuggable_apps" msgid="4386209254520471208">"Бир да мүчүлүштүктөрү оңдоло турган колдонмо жеткиликтүү эмес"</string>
     <string name="buffer_size" msgid="3944311026715111454">"Процессордун буферинин өлчөмү"</string>
-    <string name="show_quick_settings_tile" msgid="4971147332635291585">"Ыкчам жөндөөлөр тактасын көрсөтүү"</string>
+    <string name="show_quick_settings_tile" msgid="4971147332635291585">"Ыкчам параметрлер тактасын көрсөтүү"</string>
     <string name="saving_trace" msgid="1468692734770800541">"Телефондо аткарылган аракеттер сакталууда"</string>
     <string name="trace_saved" msgid="5869970594780992309">"Телефондо аткарылган аракеттер сакталды"</string>
     <string name="tap_to_share" msgid="6766732404489536899">"Телефондо аткарылган аракеттерди бөлүшүү үчүн таптаңыз"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 60d5698..3a0fc8d 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -36,7 +36,7 @@
     <string name="system_trace_sensitive_data" msgid="3069389866696009549">"စနစ် \'လုပ်ဆောင်ချက်မှတ်တမ်း\' ဖိုင်များတွင် အရေးကြီးသောစနစ်နှင့် အက်ပ်ဒေတာများ (အက်ပ်အသုံးပြုမှုကဲ့သို့) ပါဝင်နိုင်သည်။ စနစ်လုပ်ဆောင်ချက်မှတ်တမ်းများကို သင်ယုံကြည့်သည့် လူများ၊ အက်ပ်များနှင့်သာ မျှဝေပါ။"</string>
     <string name="share" msgid="8443979083706282338">"မျှဝေရန်"</string>
     <string name="dont_show_again" msgid="6662492041164390600">"ထပ်မပြပါနှင့်"</string>
-    <string name="use_perfetto_beta" msgid="2725630143916520160">"Perfetto ကို သုံးရန် (စမ်းသပ်ဆော့ဖ်ဝဲ)"</string>
+    <string name="use_perfetto_beta" msgid="2725630143916520160">"Perfetto ကို သုံးရန် (စမ်းသပ်)"</string>
     <string name="long_traces" msgid="5110949471775966329">"ရှည်ကြာသော လုပ်ဆောင်ချက်မှတ်တမ်းများ"</string>
     <string name="long_traces_summary" msgid="419034282946761469">"စက်ပစ္စည်းသိုလှောင်ခန်းသို့ ဆက်တိုက် သိမ်းထားသည်"</string>
     <string name="long_traces_summary_betterbug" msgid="445546400875135624">"စက်သိုလှောင်ခန်းသို့ အဆက်မပြတ် သိမ်းထားသည် (ချွတ်ယွင်းချက် အစီရင်ခံစာများတွင် အလိုအလျောက် ပူးတွဲမည်မဟုတ်ပါ)"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 386dc7e..696573a 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -36,7 +36,7 @@
     <string name="system_trace_sensitive_data" msgid="3069389866696009549">"Os ficheiros de rastreio do sistema podem incluir dados confidenciais do sistema e de aplicações (por exemplo, a utilização de aplicações). Partilhe os rastreios do sistema apenas com pessoas e aplicações de confiança."</string>
     <string name="share" msgid="8443979083706282338">"Partilhar"</string>
     <string name="dont_show_again" msgid="6662492041164390600">"Não mostrar de novo"</string>
-    <string name="use_perfetto_beta" msgid="2725630143916520160">"Utilizar o Perfetto (beta)"</string>
+    <string name="use_perfetto_beta" msgid="2725630143916520160">"Usar o Perfetto (beta)"</string>
     <string name="long_traces" msgid="5110949471775966329">"Rastreios longos"</string>
     <string name="long_traces_summary" msgid="419034282946761469">"Guardado continuamente no armazenamento do dispositivo"</string>
     <string name="long_traces_summary_betterbug" msgid="445546400875135624">"Guardados de forma contínua no armazenamento do dispositivo (não serão anexados automaticamente aos relatórios de erros)"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index bf8ad74..0ff02dc 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -14,7 +14,7 @@
     <string name="applications" msgid="521776761270770549">"Aplikacije"</string>
     <string name="no_debuggable_apps" msgid="4386209254520471208">"Na voljo ni nobenih aplikacij, v katerih je mogoče odpravljati napake"</string>
     <string name="buffer_size" msgid="3944311026715111454">"Velikost medpomnilnika za posamezno CPE"</string>
-    <string name="show_quick_settings_tile" msgid="4971147332635291585">"Prikaz ploščice s hitrimi nastavitvami"</string>
+    <string name="show_quick_settings_tile" msgid="4971147332635291585">"Prikaz ploščice v hitrih nastavitvah"</string>
     <string name="saving_trace" msgid="1468692734770800541">"Shranjevanje sledi"</string>
     <string name="trace_saved" msgid="5869970594780992309">"Sled je shranjena"</string>
     <string name="tap_to_share" msgid="6766732404489536899">"Dotaknite se, če želite deliti sled"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index adcc0f7..ce2b82a 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -38,7 +38,7 @@
     <string name="dont_show_again" msgid="6662492041164390600">"మళ్లీ చూపవద్దు"</string>
     <string name="use_perfetto_beta" msgid="2725630143916520160">"Perfetto (బీటా)ని ఉపయోగించండి"</string>
     <string name="long_traces" msgid="5110949471775966329">"ఎక్కువ నిడివి స్థితిగతి"</string>
-    <string name="long_traces_summary" msgid="419034282946761469">"పరికర నిల్వలో నిరంతరం సేవ్ చేయబడుతుంది"</string>
+    <string name="long_traces_summary" msgid="419034282946761469">"పరికర స్టోరేజ్‌లో నిరంతరం సేవ్ చేయబడుతుంది"</string>
     <string name="long_traces_summary_betterbug" msgid="445546400875135624">"పరికర స్టోరేజ్‌కు నిరంతరం సేవ్ చేయబడుతుంది (బగ్ రిపోర్ట్‌లకు ఆటోమేటిక్‌గా అటాచ్ చేయబడదు)"</string>
     <string name="max_long_trace_size" msgid="1943788179787181241">"అత్యధిక స్థితి గతి నిడివి సైజ్‌"</string>
     <string name="max_long_trace_duration" msgid="8009837944364246785">"అత్యధిక నిడివి ఉన్న స్థితిగతి పరిణామం"</string>
diff --git a/res/values/preference_keys.xml b/res/values/preference_keys.xml
index d4d2d08..153ddd2 100644
--- a/res/values/preference_keys.xml
+++ b/res/values/preference_keys.xml
@@ -2,7 +2,7 @@
 
 <resources>
     <string name="pref_key_tracing_on">tracing_on</string>
-    <string name="pref_key_tags">current_tags_7</string>
+    <string name="pref_key_tags">current_tags_9</string>
     <string name="pref_key_apps">all_apps</string>
     <string name="pref_key_buffer_size">buffer_size</string>
     <string name="pref_key_long_traces">long_traces</string>
diff --git a/src/com/android/traceur/Receiver.java b/src/com/android/traceur/Receiver.java
index b720f8a..f3c2ae3 100644
--- a/src/com/android/traceur/Receiver.java
+++ b/src/com/android/traceur/Receiver.java
@@ -56,16 +56,16 @@
     public static final String NOTIFICATION_CHANNEL_OTHER = "system-tracing";
 
     private static final List<String> TRACE_TAGS = Arrays.asList(
-            "am", "binder_driver", "camera", "dalvik", "freq", "gfx", "hal",
-            "idle", "input", "memory", "memreclaim", "power", "res", "sched",
-            "sync", "thermal", "view", "webview", "wm", "workq");
+            "aidl", "am", "binder_driver", "camera", "dalvik", "disk", "freq",
+            "gfx", "hal", "idle", "input", "memory", "memreclaim", "network", "power",
+            "res", "sched", "sync", "thermal", "view", "webview", "wm", "workq");
 
     /* The user list doesn't include workq or sync, because the user builds don't have
      * permissions for them. */
     private static final List<String> TRACE_TAGS_USER = Arrays.asList(
-            "am", "binder_driver", "camera", "dalvik", "freq", "gfx", "hal",
-            "idle", "input", "memory", "memreclaim", "power", "res", "sched",
-            "thermal", "view", "webview", "wm");
+            "aidl", "am", "binder_driver", "camera", "dalvik", "disk", "freq",
+            "gfx", "hal", "idle", "input", "memory", "memreclaim", "network", "power",
+            "res", "sched", "thermal", "view", "webview", "wm");
 
     private static final String TAG = "Traceur";