Snap for 6439596 from a6af0d1be082d93f6cc1cc97e974ba297ce24153 to qt-aml-tzdata-releaseq_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11q_tzdata_aml_297100000android12-mainline-tzdata-releaseandroid10-mainline-tzdata-releaseandroid10-android13-mainline-tzdata-release

Change-Id: I9da0a8ff2d0d364530ddd322324056625178fc5d

38 files changed, 73 insertions, 152 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1ca607e5b..1f13e3e80 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -6,7 +6,7 @@
 
     <uses-sdk
         android:minSdkVersion="19"
-        android:targetSdkVersion="29" />
+        android:targetSdkVersion="28" />
 
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index e4d34f5eb..af1621572 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -188,7 +188,7 @@
     <string name="clear_effects" msgid="6192797848995967992">"Obriši efekte"</string>
     <string name="effect_silly_faces" msgid="7952713419757286453">"SMEŠNA LICA"</string>
     <string name="effect_background" msgid="1358432220077975015">"POZADINA"</string>
-    <string name="accessibility_shutter_button" msgid="6040483605347230438">"Zatvarač"</string>
+    <string name="accessibility_shutter_button" msgid="6040483605347230438">"Okidač"</string>
     <string name="accessibility_cancel_button" msgid="5679989494636116448">"Otkaži"</string>
     <string name="accessibility_menu_button" msgid="7692103503958544723">"Dugme menija"</string>
     <string name="accessibility_check_box" msgid="1084094675439953723">"Polje za potvrdu %1$s"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 20fdf24f8..8eac9eb5e 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -161,7 +161,7 @@
     <string name="dialog_report" msgid="7616428760369876209">"Prijavi"</string>
     <string name="dialog_dismiss" msgid="1382550604990470119">"Odbaci"</string>
     <string name="spaceIsLow_content" product="default" msgid="4522771065344332702">"Vaša SD kartica je skoro puna. Promijenite postavku kvaliteta ili izbrišite nekoliko slika ili drugih fajlova."</string>
-    <string name="video_reach_size_limit" msgid="9196836111505731836">"Dostignut limit za veličinu videozapisa."</string>
+    <string name="video_reach_size_limit" msgid="9196836111505731836">"Dostignuto je ograničenje veličine."</string>
     <string name="pano_too_fast_prompt" msgid="2503148095578052177">"Prebrzo kretanje"</string>
     <string name="pano_dialog_prepare_preview" msgid="4445235163599534263">"Pripremanje panorame"</string>
     <string name="pano_dialog_panorama_failed" msgid="6772546547048693619">"Panorama nije mogla biti sačuvana."</string>
@@ -270,7 +270,7 @@
     <string name="time_lapse_seconds" msgid="7319683099532506270">"Broj sekundi:"</string>
     <string name="time_lapse_minutes" msgid="5325447383033224679">"Broj minuta:"</string>
     <string name="time_lapse_hours" msgid="5294001144133261436">"Broj sati:"</string>
-    <string name="time_lapse_interval_set" msgid="2418594453248958440">"Završeno"</string>
+    <string name="time_lapse_interval_set" msgid="2418594453248958440">"Gotovo"</string>
     <string name="set_time_interval" msgid="2531393962847535331">"Postaviti vremenski interval"</string>
     <string name="set_time_interval_help" msgid="64145154088021389">"Funkcija protoka vremena je isključena. Uključite je kako biste postavili vremenski interval."</string>
     <string name="set_duration" msgid="1638453882581604341">"Postaviti tajmer u sekundama"</string>
@@ -297,12 +297,12 @@
     <string name="mode_timelapse" msgid="1517168724627815453">"Protok vremena"</string>
     <string name="mode_wideangle" msgid="1099640345041696830">"Široki ugao"</string>
     <string name="mode_panorama" msgid="6882648621305828861">"Panoramski način rada"</string>
-    <string name="mode_refocus" msgid="172192967119469061">"Efekt s izoštr. objektom"</string>
+    <string name="mode_refocus" msgid="172192967119469061">"Efekat s izoštr. objektom"</string>
     <string name="mode_camera_desc" msgid="3670807361165657278">"Prebaci na način rada za kameru"</string>
     <string name="mode_video_desc" msgid="4058407412929464689">"Prebaciti na videokameru"</string>
     <string name="mode_photosphere_desc" msgid="2403816283825579161">"Prebaci na način rada za photo sphere fotografije"</string>
     <string name="mode_panorama_desc" msgid="6023020404237519590">"Prebaci na panoramski način rada"</string>
-    <string name="mode_refocus_desc" msgid="6171183297515508465">"Prebaci na način rada Efekt s izoštrenim objektom"</string>
+    <string name="mode_refocus_desc" msgid="6171183297515508465">"Prebaci na način rada Efekat s izoštrenim objektom"</string>
     <string name="settings_open_desc" msgid="6914471293841793766">"Otvori postavke"</string>
     <string name="settings_close_desc" msgid="3095831199632813127">"Zatvori postavke"</string>
     <string name="hdr_plus_off_desc" msgid="5301287296717144319">"HDR Plus isključen"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 82d8bee3b..c3cbdae25 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -90,7 +90,7 @@
     <string name="setting_off" msgid="6782191065550276632">"Desactivat"</string>
     <string name="setting_on" msgid="9086728135773197891">"Activat"</string>
     <string name="pref_video_quality_title" msgid="5887153490982738588">"Qualitat de vídeo"</string>
-    <string name="pref_video_time_lapse_frame_interval_title" msgid="4975260837607993569">"Interval de temps"</string>
+    <string name="pref_video_time_lapse_frame_interval_title" msgid="4975260837607993569">"Filmació a intervals"</string>
     <string name="pref_camera_settings_category" msgid="4274141528139077830">"Configuració de la càmera"</string>
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Configuració de la càmera de vídeo"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Mida de la foto"</string>
@@ -294,7 +294,7 @@
     <string name="mode_camera" msgid="279763925715250603">"Càmera"</string>
     <string name="mode_video" msgid="8633929034048169139">"Vídeo"</string>
     <string name="mode_photosphere" msgid="5082338476237291833">"Fotografia esfèrica"</string>
-    <string name="mode_timelapse" msgid="1517168724627815453">"Interval de temps"</string>
+    <string name="mode_timelapse" msgid="1517168724627815453">"Filmació a intervals"</string>
     <string name="mode_wideangle" msgid="1099640345041696830">"Gran angular"</string>
     <string name="mode_panorama" msgid="6882648621305828861">"Panoràmica"</string>
     <string name="mode_refocus" msgid="172192967119469061">"Efecte d\'enfocament"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index f73580ebe..0016ddbed 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -156,7 +156,7 @@
     <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"Kamera auf der Vorderseite"</string>
     <string name="pref_camera_id_label_front" msgid="349308803062874842">"Kamera auf der Rückseite"</string>
-    <string name="dialog_ok" msgid="774141340500181131">"OK"</string>
+    <string name="dialog_ok" msgid="774141340500181131">"Ok"</string>
     <string name="dialog_cancel" msgid="692365061128351656">"Abbrechen"</string>
     <string name="dialog_report" msgid="7616428760369876209">"Feedback"</string>
     <string name="dialog_dismiss" msgid="1382550604990470119">"Schließen"</string>
@@ -373,7 +373,7 @@
     <string name="share_to" msgid="5144911209144798122">"Teilen über"</string>
     <string name="edit_with" msgid="615569327230783971">"Bearbeiten mit"</string>
     <string name="startup_dialog_button_next" msgid="1011831256978228993">"Weiter"</string>
-    <string name="confirm_button_text" msgid="7389949384482206814">"OK"</string>
+    <string name="confirm_button_text" msgid="7389949384482206814">"Ok"</string>
     <string name="full_sensor_4x3_aspect_ratio" msgid="1270461419743888925">"Ergebnis beibehalten \n(4:3)"</string>
     <string name="cropped_sensor_16x9_aspect_ratio" msgid="4742161537633251795">"Ergebnis zuschneiden \n(16:9)"</string>
     <string name="pref_boolean_false" msgid="461317129020087333">"0"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 086591eb3..253401488 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -68,7 +68,7 @@
     <string name="error_cannot_connect_camera" msgid="2713059773224193128">"Ezin da kamerara konektatu."</string>
     <string name="error_camera_disabled" msgid="5582398275657419692">"Segurtasun-gidalerroak direla medio, kamera desgaitu egin da."</string>
     <string name="error_media_storage_failure" msgid="7711687330673245629">"Arazo bat izan da argazkia edo bideoa gordetzean."</string>
-    <string name="error_permissions" msgid="3454167403425651254">"Aplikazioak ez du exekutatu ahal izateko derrigorrez beharrezko baimenik. Egiaztatu baimenen ezarpenak."</string>
+    <string name="error_permissions" msgid="3454167403425651254">"Aplikazioak ez du abiarazi ahal izateko derrigorrez beharrezko baimenik. Egiaztatu baimenen ezarpenak."</string>
     <string name="reason_storage_failure" msgid="6818898304774654969">"Errore bat gertatu da argazki-biltegian."</string>
     <string name="wait" msgid="765601745709933047">"Itxaron, mesedez…"</string>
     <string name="no_storage" product="default" msgid="5922012950780548098">"Txertatu SD txartela kamera erabili aurretik."</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 7680ecfc3..000d4a8a5 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -58,7 +58,7 @@
     <string name="iso" msgid="8578773821062054902">"ISO"</string>
     <string name="unit_mm" msgid="5210344300697638286">"मिमी"</string>
     <string name="manual" msgid="2444400953521760140">"विवरण पुस्तिका"</string>
-    <string name="auto" msgid="2552649885114400474">"स्वतः"</string>
+    <string name="auto" msgid="2552649885114400474">"अपने आप"</string>
     <string name="flash_on" msgid="6573457197393807642">"फ़्लैश चलाया गया"</string>
     <string name="flash_off" msgid="7889323512830926273">"कोई फ़्लैश नहीं"</string>
     <string name="unknown" msgid="564184550182858146">"अज्ञात"</string>
@@ -73,7 +73,7 @@
     <string name="wait" msgid="765601745709933047">"कृपया प्रतीक्षा करें..."</string>
     <string name="no_storage" product="default" msgid="5922012950780548098">"कैमरे का उपयोग करने से पहले SD कार्ड डालें."</string>
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"SD कार्ड तैयार हो रहा है…"</string>
-    <string name="access_sd_fail" product="default" msgid="2634861611082499811">"SD कार्ड एक्सेस नहीं कर सका."</string>
+    <string name="access_sd_fail" product="default" msgid="2634861611082499811">"SD कार्ड ऐक्सेस नहीं कर सका."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"समय अंतराल रिकॉर्डिंग"</string>
     <string name="feedback_description_camera_access" msgid="419090951070170132">"ऐप कैमरे से कनेक्‍ट नहीं कर सका"</string>
     <string name="feedback_description_save_photo" msgid="8658767358989083228">"फ़ोटो या वीडियो को डिवाइस पर नहीं सहेजा गया."</string>
@@ -98,15 +98,15 @@
     <string name="pref_camera_picturesize_entry_medium" msgid="7708839551627003154">"मध्यम"</string>
     <string name="pref_camera_picturesize_entry_small" msgid="2991239656622539068">"छोटा"</string>
     <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"फ़ोकस मोड"</string>
-    <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"स्वतः"</string>
+    <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"अपने आप"</string>
     <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"अनंत"</string>
     <string name="pref_camera_focusmode_entry_macro" msgid="7632276686726851426">"मैक्रो"</string>
-    <string name="pref_camera_focusmode_label_auto" msgid="4884418453600317694">"स्वत:"</string>
+    <string name="pref_camera_focusmode_label_auto" msgid="4884418453600317694">"अपने-आप"</string>
     <string name="pref_camera_focusmode_label_infinity" msgid="1673352016120343314">"अनंत"</string>
     <string name="pref_camera_focusmode_label_macro" msgid="5065639298027996399">"मैक्रो"</string>
     <string name="pref_camera_flashmode_title" msgid="8363803841022314574">"फ़्लैश मोड"</string>
     <string name="pref_camera_flashmode_label" msgid="5852483713534762800">"फ़्लैश मोड"</string>
-    <string name="pref_camera_flashmode_entry_auto" msgid="4211992591841657014">"स्वतः"</string>
+    <string name="pref_camera_flashmode_entry_auto" msgid="4211992591841657014">"अपने आप"</string>
     <string name="pref_camera_flashmode_entry_on" msgid="3519831202665377698">"चालू"</string>
     <string name="pref_camera_flashmode_entry_off" msgid="8861322265566617357">"बंद"</string>
     <string name="pref_camera_flashmode_label_auto" msgid="2309144918900450379">"फ़्लैश अपनेआप:"</string>
@@ -114,18 +114,18 @@
     <string name="pref_camera_flashmode_label_off" msgid="7175863901446001441">"फ़्लैश बंद"</string>
     <string name="pref_camera_whitebalance_title" msgid="7962809566612868179">"श्वेत संतुलन"</string>
     <string name="pref_camera_whitebalance_label" msgid="7370366644738746700">"श्वेत संतुलन"</string>
-    <string name="pref_camera_whitebalance_entry_auto" msgid="1390631794449502796">"स्वतः"</string>
+    <string name="pref_camera_whitebalance_entry_auto" msgid="1390631794449502796">"अपने आप"</string>
     <string name="pref_camera_whitebalance_entry_incandescent" msgid="1140391575294372706">"अत्यधिक चमकीला"</string>
     <string name="pref_camera_whitebalance_entry_daylight" msgid="757833578153467254">"दिन का प्रकाश"</string>
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="5157027611220790970">"फ़्लोरेसेंट"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3569589102226796875">"धुंधला"</string>
-    <string name="pref_camera_whitebalance_label_auto" msgid="4305837287360485369">"स्वत:"</string>
+    <string name="pref_camera_whitebalance_label_auto" msgid="4305837287360485369">"अपने-आप"</string>
     <string name="pref_camera_whitebalance_label_incandescent" msgid="2860805668879945185">"अत्यधिक चमकीला"</string>
     <string name="pref_camera_whitebalance_label_daylight" msgid="4562002095198912409">"दिन का प्रकाश"</string>
     <string name="pref_camera_whitebalance_label_fluorescent" msgid="10552295745391742">"फ़्लोरेसेंट"</string>
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"धुंधला"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"दृश्य मोड"</string>
-    <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"स्वतः"</string>
+    <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"अपने आप"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
     <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ चालू"</string>
@@ -279,7 +279,7 @@
     <string name="remember_location_prompt" msgid="3006013504489919474">"अपनी फ़ोटो और वीडियो उन स्‍थानों के साथ टैग करें जहां वे लिए गए हैं."</string>
     <string name="remember_location_no" msgid="4412802756840226925">"नहीं,रहने दें"</string>
     <string name="remember_location_yes" msgid="4339424460683531388">"हां"</string>
-    <string name="camera_menu_more_label" msgid="7951917844735828365">"अधिक विकल्प"</string>
+    <string name="camera_menu_more_label" msgid="7951917844735828365">"ज़्यादा विकल्प"</string>
     <string name="camera_menu_settings_label" msgid="3862756725328016822">"सेटिंग"</string>
     <string name="create_tiny_planet" msgid="5186918191372107343">"छोटा ग्रह बनाएं"</string>
     <string name="saving_tiny_planet" msgid="8828265180177375494">"छोटा ग्रह सहेजा जा रहा है …"</string>
@@ -313,7 +313,7 @@
     <string name="flash_auto_desc" msgid="3009043125539675717">"फ़्लैश ऑटो"</string>
     <string name="flash_on_desc" msgid="930372145324854699">"फ़्लैश चालू"</string>
     <string name="hdr_plus_flash_off_desc" msgid="5335888906983788789">"HDR+ फ़्लैश बंद"</string>
-    <string name="hdr_plus_flash_auto_desc" msgid="4812200236263011537">"HDR+ फ़्लैश स्वत:"</string>
+    <string name="hdr_plus_flash_auto_desc" msgid="4812200236263011537">"HDR+ फ़्लैशअपने-आप"</string>
     <string name="hdr_plus_flash_on_desc" msgid="8323389161987561284">"HDR+ फ़्लैश चालू"</string>
     <string name="torch_on_desc" msgid="3069836196559213365">"टॉर्च चालू"</string>
     <string name="torch_off_desc" msgid="8304675202998742618">"टॉर्च बंद"</string>
@@ -324,7 +324,7 @@
     <string name="countdown_timer_off" msgid="1663008439564495948">"काउंटडाउन टाइमर बंद है"</string>
     <string name="countdown_timer_duration_3s" msgid="7435393834886072664">"काउंटडाउन टाइमर अवधि 3 सेकंड पर सेट है"</string>
     <string name="countdown_timer_duration_10s" msgid="9085308782250002795">"काउंटडाउन टाइमर अवधि 10 सेकंड पर सेट है"</string>
-    <string name="more_options_desc" msgid="4628738800610478353">"अधिक विकल्प"</string>
+    <string name="more_options_desc" msgid="4628738800610478353">"ज़्यादा विकल्प"</string>
     <string name="cancel_button_description" msgid="3801167024006905033">"अभी नहीं"</string>
     <string name="done_button_description" msgid="1334963435441544592">"पूर्ण"</string>
     <string name="retake_button_description" msgid="4234613030674787714">"फिर से लें"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 63294dc30..2351327f3 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -345,7 +345,7 @@
     <string name="setting_back_camera_video" msgid="5220819479408164689">"Հետևի տեսախցիկ` տեսանյութ"</string>
     <string name="setting_front_camera_photo" msgid="4131886734622868637">"Առջևի տեսախցիկ` լուսանկար"</string>
     <string name="setting_front_camera_video" msgid="2178799452805359752">"Առջևի տեսախցիկ` տեսանյութ"</string>
-    <string name="setting_default_camera" msgid="6954076799301004779">"Լռելյայն տեսախցիկը"</string>
+    <string name="setting_default_camera" msgid="6954076799301004779">"Կանխադրված տեսախցիկը"</string>
     <string name="setting_google_help_and_feedback" msgid="2079580537079242775">"Օգնություն և հետադարձ կապ"</string>
     <string name="processing_hdr_plus" msgid="9160093263037540304">"Մշակվում է HDR+..."</string>
     <string name="open_source_licenses" msgid="2169711954264883060">"Բաց կոդի"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index a9ab83393..23d5a63da 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -87,7 +87,7 @@
     <!-- no translation found for pref_camera_timer_sound_default (6225207881203007747) -->
     <skip />
     <string name="pref_camera_timer_sound_title" msgid="9036987234878551217">"Bip conto alla rov."</string>
-    <string name="setting_off" msgid="6782191065550276632">"OFF"</string>
+    <string name="setting_off" msgid="6782191065550276632">"Off"</string>
     <string name="setting_on" msgid="9086728135773197891">"ON"</string>
     <string name="pref_video_quality_title" msgid="5887153490982738588">"Qualità video"</string>
     <string name="pref_video_time_lapse_frame_interval_title" msgid="4975260837607993569">"Time-lapse"</string>
@@ -124,7 +124,7 @@
     <string name="pref_camera_whitebalance_label_daylight" msgid="4562002095198912409">"LUCE DIURNA"</string>
     <string name="pref_camera_whitebalance_label_fluorescent" msgid="10552295745391742">"LUCE NEON"</string>
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"NUVOLOSO"</string>
-    <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Modalità scena"</string>
+    <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Modalità Scena"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automatica"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
@@ -146,7 +146,7 @@
     <string name="pref_camera_countdown_label_three" msgid="3154170918067103541">"3 SECONDI"</string>
     <string name="pref_camera_countdown_label_ten" msgid="4372650985906500604">"10 SECONDI"</string>
     <string name="pref_camera_countdown_label_fifteen" msgid="8469955900530268867">"15 SECONDI"</string>
-    <string name="not_selectable_in_scene_mode" msgid="3260801086980522611">"Non selezionabile in modalità scena."</string>
+    <string name="not_selectable_in_scene_mode" msgid="3260801086980522611">"Non selezionabile in modalità Scena."</string>
     <string name="pref_exposure_title" msgid="7525751789152582800">"Esposizione"</string>
     <string name="pref_exposure_label" msgid="2604738602400261218">"ESPOSIZIONE"</string>
     <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 41e4633f6..1727e9386 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -62,7 +62,7 @@
     <string name="flash_on" msgid="6573457197393807642">"フラッシュON"</string>
     <string name="flash_off" msgid="7889323512830926273">"フラッシュOFF"</string>
     <string name="unknown" msgid="564184550182858146">"不明"</string>
-    <string name="try_to_set_local_album_available_offline" msgid="3363125545009254117">"このアイテムは端末に保存され、オフラインで利用できます。"</string>
+    <string name="try_to_set_local_album_available_offline" msgid="3363125545009254117">"このアイテムはデバイスに保存され、オフラインで利用できます。"</string>
     <string name="please_wait" msgid="1416313324505140068">"お待ちください"</string>
     <string name="camera_error_title" msgid="6200558085072670067">"カメラエラー"</string>
     <string name="error_cannot_connect_camera" msgid="2713059773224193128">"カメラに接続できません。"</string>
@@ -76,7 +76,7 @@
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"SDカードにアクセスできませんでした。"</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"低速度撮影"</string>
     <string name="feedback_description_camera_access" msgid="419090951070170132">"アプリをカメラに接続できませんでした"</string>
-    <string name="feedback_description_save_photo" msgid="8658767358989083228">"写真または動画は端末に保存されませんでした。"</string>
+    <string name="feedback_description_save_photo" msgid="8658767358989083228">"写真または動画はデバイスに保存されませんでした。"</string>
     <string name="capturing" msgid="5255164204641920893">"キャプチャしています"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"カメラを選択"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"戻る"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 17a078da7..b094d4a05 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -348,7 +348,7 @@
     <string name="setting_default_camera" msgid="6954076799301004779">"Бастапқы камера"</string>
     <string name="setting_google_help_and_feedback" msgid="2079580537079242775">"Анықтама және кері байл."</string>
     <string name="processing_hdr_plus" msgid="9160093263037540304">"HDR+ өңделуде …"</string>
-    <string name="open_source_licenses" msgid="2169711954264883060">"Ашық бастапқы код лицензиялары"</string>
+    <string name="open_source_licenses" msgid="2169711954264883060">"Ашық кодты бағдарлама лицензиялары"</string>
     <string name="pref_category_general" msgid="6737748849700581019">"Жалпы параметрлер"</string>
     <string name="pref_category_resolution_quality" msgid="6641462402321962896">"Ажыратымдылық және сапа"</string>
     <string name="pref_category_about" msgid="1966255405679342337">"Туралы"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 7dc363e4a..59c997dbd 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -348,7 +348,7 @@
     <string name="setting_default_camera" msgid="6954076799301004779">"डीफॉल्ट कॅमेरा"</string>
     <string name="setting_google_help_and_feedback" msgid="2079580537079242775">"मदत आणि अभिप्राय"</string>
     <string name="processing_hdr_plus" msgid="9160093263037540304">"HDR+ प्रक्रिया करत आहे …"</string>
-    <string name="open_source_licenses" msgid="2169711954264883060">"मुक्त स्त्रोत परवाने"</string>
+    <string name="open_source_licenses" msgid="2169711954264883060">"मुक्त स्रोत परवाने"</string>
     <string name="pref_category_general" msgid="6737748849700581019">"सामान्य सेटिंग्ज"</string>
     <string name="pref_category_resolution_quality" msgid="6641462402321962896">"रिझोल्‍यूशन आणि गुणवत्ता"</string>
     <string name="pref_category_about" msgid="1966255405679342337">"विषयी"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index ec1fa87bf..77ad6a6b9 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -195,7 +195,7 @@
     <string name="accessibility_switch_to_camera" msgid="4518394037216725274">"Alternar para foto"</string>
     <string name="accessibility_switch_to_video" msgid="8174781871592793967">"Alternar para vídeo"</string>
     <string name="accessibility_switch_to_panorama" msgid="8322228859117808037">"Alternar para panorama"</string>
-    <string name="accessibility_switch_to_photo_sphere" msgid="5803217570370854725">"Alternar para photo sphere"</string>
+    <string name="accessibility_switch_to_photo_sphere" msgid="5803217570370854725">"Alternar para foto esférica"</string>
     <string name="accessibility_switch_to_gcam" msgid="7562625440767034695">"Alternar para alta qualidade"</string>
     <string name="accessibility_switch_to_refocus" msgid="6796169367953860106">"Alternar para Mudar foco"</string>
     <string name="accessibility_review_cancel" msgid="5462850829869569629">"Cancelar"</string>
@@ -300,7 +300,7 @@
     <string name="mode_refocus" msgid="172192967119469061">"Efeito foco"</string>
     <string name="mode_camera_desc" msgid="3670807361165657278">"Alternar para o modo de câmera"</string>
     <string name="mode_video_desc" msgid="4058407412929464689">"Alternar para a câmera de vídeo"</string>
-    <string name="mode_photosphere_desc" msgid="2403816283825579161">"Alternar para o modo photo sphere"</string>
+    <string name="mode_photosphere_desc" msgid="2403816283825579161">"Alternar para o modo foto esférica"</string>
     <string name="mode_panorama_desc" msgid="6023020404237519590">"Alterar para o modo de panorama"</string>
     <string name="mode_refocus_desc" msgid="6171183297515508465">"Alternar para o modo Efeito foco"</string>
     <string name="settings_open_desc" msgid="6914471293841793766">"Abrir configurações"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index de1a154bb..89d08ddf9 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -188,7 +188,7 @@
     <string name="clear_effects" msgid="6192797848995967992">"Обриши ефекте"</string>
     <string name="effect_silly_faces" msgid="7952713419757286453">"СМЕШНА ЛИЦА"</string>
     <string name="effect_background" msgid="1358432220077975015">"ПОЗАДИНА"</string>
-    <string name="accessibility_shutter_button" msgid="6040483605347230438">"Затварач"</string>
+    <string name="accessibility_shutter_button" msgid="6040483605347230438">"Окидач"</string>
     <string name="accessibility_cancel_button" msgid="5679989494636116448">"Откажи"</string>
     <string name="accessibility_menu_button" msgid="7692103503958544723">"Дугме менија"</string>
     <string name="accessibility_check_box" msgid="1084094675439953723">"Поље за потврду %1$s"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index d48cd3cb0..422478829 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -75,7 +75,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"SD கார்டைத் தயார் செய்கிறது..."</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"SD கார்டை அணுக முடியவில்லை."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"இடைவெளிக்கான நேரம் பதிவாகிறது"</string>
-    <string name="feedback_description_camera_access" msgid="419090951070170132">"பயன்பாட்டை கேமராவுடன் இணைக்க முடியவில்லை"</string>
+    <string name="feedback_description_camera_access" msgid="419090951070170132">"ஆப்ஸை கேமராவுடன் இணைக்க முடியவில்லை"</string>
     <string name="feedback_description_save_photo" msgid="8658767358989083228">"சாதனத்தில் படம் அல்லது வீடியோ சேமிக்கப்படவில்லை."</string>
     <string name="capturing" msgid="5255164204641920893">"படமெடுக்கிறது"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"கேமராவைத் தேர்வுசெய்க"</string>
@@ -190,7 +190,7 @@
     <string name="effect_background" msgid="1358432220077975015">"பின்புலம்"</string>
     <string name="accessibility_shutter_button" msgid="6040483605347230438">"ஷட்டர்"</string>
     <string name="accessibility_cancel_button" msgid="5679989494636116448">"ரத்துசெய்"</string>
-    <string name="accessibility_menu_button" msgid="7692103503958544723">"மெனு பொத்தான்"</string>
+    <string name="accessibility_menu_button" msgid="7692103503958544723">"மெனு பட்டன்"</string>
     <string name="accessibility_check_box" msgid="1084094675439953723">"%1$s செக் பாக்ஸ்"</string>
     <string name="accessibility_switch_to_camera" msgid="4518394037216725274">"படத்திற்கு மாறு"</string>
     <string name="accessibility_switch_to_video" msgid="8174781871592793967">"வீடியோவிற்கு மாறு"</string>
@@ -339,7 +339,7 @@
     <string name="exposure_compensation_desc_0" msgid="2820273752287040523">"எக்ஸ்போஷரைச் சரிசெய்தல் 0"</string>
     <string name="exposure_compensation_desc_p1" msgid="2328275401634452554">"எக்ஸ்போஷரைச் சரிசெய்தல் +1"</string>
     <string name="exposure_compensation_desc_p2" msgid="4555277824096107142">"எக்ஸ்போஷரைச் சரிசெய்தல் +2"</string>
-    <string name="button_change_announcement" msgid="3759686152778772111">"பொத்தான் இப்போது %s இல் உள்ளது"</string>
+    <string name="button_change_announcement" msgid="3759686152778772111">"பட்டன் இப்போது %s இல் உள்ளது"</string>
     <string name="setting_location" msgid="4459859689227893838">"இருப்பிடம்"</string>
     <string name="setting_back_camera_photo" msgid="256738900473265017">"பின்புற கேமரா படம்"</string>
     <string name="setting_back_camera_video" msgid="5220819479408164689">"பின்புற கேமரா வீடியோ"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 41305a755..af216530e 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -212,7 +212,7 @@
     <string name="photo_date_content_description" msgid="5705865897898465619">"%s 拍攝的相片"</string>
     <string name="video_date_content_description" msgid="2151884014634284456">"%s 拍攝的影片"</string>
     <string name="panorama_date_content_description" msgid="990703578639006144">"%s 拍攝的全景相片"</string>
-    <string name="photosphere_date_content_description" msgid="4183741743409007876">"%s 拍攝的 Photo Sphere 全景相片"</string>
+    <string name="photosphere_date_content_description" msgid="4183741743409007876">"%s 拍攝的 全景相片"</string>
     <string name="refocus_date_content_description" msgid="5630960320424345547">"%s 拍攝的鏡頭模糊相片"</string>
     <string name="media_processing_content_description" msgid="8138587719107183754">"正在處理的媒體項目"</string>
     <string name="accessibility_mode_list_toggle" msgid="4784230103566918645">"切換模式清單"</string>
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 8efc25f47..8c0b5bf54 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -194,6 +194,9 @@ public class CameraActivity extends QuickActivity
     private static final long SCREEN_DELAY_MS = 2 * 60 * 1000; // 2 mins.
     /** Load metadata for 10 items ahead of our current. */
     private static final int FILMSTRIP_PRELOAD_AHEAD_ITEMS = 10;
+    private static final int PERMISSIONS_ACTIVITY_REQUEST_CODE = 1;
+    private static final int PERMISSIONS_RESULT_CODE_OK = 1;
+    private static final int PERMISSIONS_RESULT_CODE_FAILED = 2;
 
     /** Should be used wherever a context is needed. */
     private Context mAppContext;
@@ -847,7 +850,6 @@ public class CameraActivity extends QuickActivity
                 messageId > 0 ? getString(messageId) : "");
     }
 
-    // Candidate for deletion as Android Beam is deprecated in Android Q
     private void setupNfcBeamPush() {
         NfcAdapter adapter = NfcAdapter.getDefaultAdapter(mAppContext);
         if (adapter == null) {
@@ -1631,7 +1633,6 @@ public class CameraActivity extends QuickActivity
 
         preloadFilmstripItems();
 
-        // Candidate for deletion as Android Beam is deprecated in Android Q
         setupNfcBeamPush();
 
         mLocalImagesObserver = new FilmstripContentObserver();
@@ -1933,14 +1934,10 @@ public class CameraActivity extends QuickActivity
         } else {
             mHasCriticalPermissions = false;
         }
-        if (!mHasCriticalPermissions || (mSettingsManager.getBoolean(
-                SettingsManager.SCOPE_GLOBAL, Keys.KEY_RECORD_LOCATION) &&
-                (checkSelfPermission(Manifest.permission.ACCESS_COARSE_LOCATION)
-                   != PackageManager.PERMISSION_GRANTED) &&
-                !mSettingsManager.getBoolean(SettingsManager.SCOPE_GLOBAL,
-                    Keys.KEY_HAS_SEEN_PERMISSIONS_DIALOGS))) {
-            // TODO: Convert PermissionsActivity into a dialog so we
-            // don't lose the state of CameraActivity.
+
+        if ((checkSelfPermission(Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED &&
+                !mSettingsManager.getBoolean(SettingsManager.SCOPE_GLOBAL, Keys.KEY_HAS_SEEN_PERMISSIONS_DIALOGS)) ||
+                !mHasCriticalPermissions) {
             Intent intent = new Intent(this, PermissionsActivity.class);
             startActivity(intent);
             finish();
diff --git a/src/com/android/camera/PermissionsActivity.java b/src/com/android/camera/PermissionsActivity.java
index aca4778e6..1f94463ff 100644
--- a/src/com/android/camera/PermissionsActivity.java
+++ b/src/com/android/camera/PermissionsActivity.java
@@ -24,9 +24,6 @@ import com.android.camera2.R;
 
 /**
  * Activity that shows permissions request dialogs and handles lack of critical permissions.
- * TODO: Convert PermissionsActivity into a dialog to be emitted from
- * CameraActivity as not to have to restart CameraActivity from
- * scratch.
  */
 public class PermissionsActivity extends QuickActivity {
     private static final Log.Tag TAG = new Log.Tag("PermissionsActivity");
@@ -135,10 +132,8 @@ public class PermissionsActivity extends QuickActivity {
             mFlagHasWriteStoragePermission = true;
         }
 
-        if (mSettingsManager.getBoolean(SettingsManager.SCOPE_GLOBAL,
-            Keys.KEY_RECORD_LOCATION)
-                && (checkSelfPermission(Manifest.permission.ACCESS_COARSE_LOCATION)
-                != PackageManager.PERMISSION_GRANTED)) {
+        if (checkSelfPermission(Manifest.permission.ACCESS_COARSE_LOCATION)
+                != PackageManager.PERMISSION_GRANTED) {
             mNumPermissionsToRequest++;
             mShouldRequestLocationPermission = true;
         }
diff --git a/src/com/android/camera/app/FirstRunDialog.java b/src/com/android/camera/app/FirstRunDialog.java
index 58e1fcbba..91c057092 100644
--- a/src/com/android/camera/app/FirstRunDialog.java
+++ b/src/com/android/camera/app/FirstRunDialog.java
@@ -16,12 +16,9 @@
 
 package com.android.camera.app;
 
-import android.Manifest;
 import android.app.Dialog;
-import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.pm.PackageManager;
 import android.view.ViewGroup;
 
 import com.android.camera.device.CameraId;
@@ -54,9 +51,6 @@ public class FirstRunDialog {
     /** The default preference of whether enabling location recording. */
     private static final boolean DEFAULT_LOCATION_RECORDING_ENABLED = true;
 
-    /** Request code to PackageManager */
-    private static final int PERMISSION_REQUEST_CODE = 1;
-
     /** Listener to receive events. */
     private final FirstRunDialogListener mListener;
 
@@ -209,18 +203,6 @@ public class FirstRunDialog {
         mAspectRatioPreferenceDialog.show();
     }
 
-    private void checkLocationPermission() {
-        if (mContext.checkSelfPermission(Manifest.permission.ACCESS_COARSE_LOCATION)
-                != PackageManager.PERMISSION_GRANTED) {
-            Activity activity = (Activity) mContext;
-            activity.requestPermissions(
-                new String[] {Manifest.permission.ACCESS_COARSE_LOCATION},
-                PERMISSION_REQUEST_CODE);
-            mSettingsManager.set(SettingsManager.SCOPE_GLOBAL,
-                Keys.KEY_HAS_SEEN_PERMISSIONS_DIALOGS, true);
-        }
-    }
-
     /**
      * Prompts a dialog to allow people to choose location preference when
      * people open the app for the first time. If the preference has been set,
@@ -238,9 +220,6 @@ public class FirstRunDialog {
                         SettingsManager.SCOPE_GLOBAL,
                         Keys.KEY_RECORD_LOCATION,
                         locationRecordingEnabled);
-                if (locationRecordingEnabled) {
-                    checkLocationPermission();
-                }
 
                 if (shouldShowAspectRatioDialog()) {
                     // Prompt the second dialog about aspect ratio preference.
diff --git a/src/com/android/camera/async/Futures2.java b/src/com/android/camera/async/Futures2.java
index 052c722e8..666913295 100644
--- a/src/com/android/camera/async/Futures2.java
+++ b/src/com/android/camera/async/Futures2.java
@@ -20,7 +20,6 @@ import com.google.common.util.concurrent.AsyncFunction;
 import com.google.common.util.concurrent.ForwardingListenableFuture;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.MoreExecutors;
 
 import java.util.List;
 
@@ -97,7 +96,7 @@ public class Futures2 {
         // allAsList will propagate the failures instead of null values to the
         // parameters of the supplied function.
         ListenableFuture<List<Object>> result = Futures.<Object>allAsList(futures);
-        return Futures.transformAsync(result, new AsyncFunction<List<Object>, TResult>() {
+        return Futures.transform(result, new AsyncFunction<List<Object>, TResult>() {
             @Override
             public ListenableFuture<TResult> apply(@Nullable List<Object> list) throws Exception {
                 T1 value1 = (T1) list.get(0);
@@ -105,7 +104,7 @@ public class Futures2 {
 
                 return fn.apply(value1, value2);
             }
-        }, MoreExecutors.directExecutor());
+        });
     }
 
     /**
@@ -142,7 +141,7 @@ public class Futures2 {
         // allAsList will propagate the failures instead of null values to the
         // parameters of the supplied function.
         ListenableFuture<List<Object>> result = Futures.<Object>allAsList(futures);
-        return Futures.transformAsync(result, new AsyncFunction<List<Object>, TResult>() {
+        return Futures.transform(result, new AsyncFunction<List<Object>, TResult>() {
             @Override
             public ListenableFuture<TResult> apply(@Nullable List<Object> list) throws Exception {
                 T1 value1 = (T1) list.get(0);
@@ -151,7 +150,7 @@ public class Futures2 {
 
                 return fn.apply(value1, value2, value3);
             }
-        }, MoreExecutors.directExecutor());
+        });
     }
 
     /**
diff --git a/src/com/android/camera/async/Observables.java b/src/com/android/camera/async/Observables.java
index 0fbfc6c49..e946fee5f 100644
--- a/src/com/android/camera/async/Observables.java
+++ b/src/com/android/camera/async/Observables.java
@@ -114,6 +114,6 @@ public class Observables {
             public void run() {
                 callback.update(observable.get());
             }
-        }, MoreExecutors.directExecutor());
+        }, MoreExecutors.sameThreadExecutor());
     }
 }
diff --git a/src/com/android/camera/one/OneCameraCharacteristics.java b/src/com/android/camera/one/OneCameraCharacteristics.java
index 27504a243..24584da45 100644
--- a/src/com/android/camera/one/OneCameraCharacteristics.java
+++ b/src/com/android/camera/one/OneCameraCharacteristics.java
@@ -135,11 +135,6 @@ public interface OneCameraCharacteristics {
     public boolean isAutoFocusSupported();
 
     /**
-     * @return true if this camera supports continuous picture autofocus.
-     */
-    public boolean isContinuousPictureAutoFocusSupported();
-
-    /**
      * @return true if this camera supports custom AutoExposure regions.
      */
     public boolean isAutoExposureSupported();
diff --git a/src/com/android/camera/one/v1/OneCameraCharacteristicsImpl.java b/src/com/android/camera/one/v1/OneCameraCharacteristicsImpl.java
index c525b572d..b14e66ec1 100644
--- a/src/com/android/camera/one/v1/OneCameraCharacteristicsImpl.java
+++ b/src/com/android/camera/one/v1/OneCameraCharacteristicsImpl.java
@@ -176,11 +176,6 @@ public class OneCameraCharacteristicsImpl implements OneCameraCharacteristics {
     }
 
     @Override
-    public boolean isContinuousPictureAutoFocusSupported() {
-        return getCameraDirection() == Facing.BACK;
-    }
-
-    @Override
     public boolean isAutoExposureSupported() {
         // Custom AE is only supported on the back camera for legacy devices.
         return getCameraDirection() == Facing.BACK;
diff --git a/src/com/android/camera/one/v2/OneCameraCharacteristicsImpl.java b/src/com/android/camera/one/v2/OneCameraCharacteristicsImpl.java
index 77e9a8173..f7a2b7e17 100644
--- a/src/com/android/camera/one/v2/OneCameraCharacteristicsImpl.java
+++ b/src/com/android/camera/one/v2/OneCameraCharacteristicsImpl.java
@@ -244,20 +244,6 @@ public class OneCameraCharacteristicsImpl implements OneCameraCharacteristics {
     }
 
     @Override
-    public boolean isContinuousPictureAutoFocusSupported() {
-        int[] availableAfModes =
-                mCameraCharacteristics.get(CameraCharacteristics.CONTROL_AF_AVAILABLE_MODES);
-        boolean continuousPictureAfModeAvailable = false;
-        for (int i = 0; i < availableAfModes.length; i++) {
-            if (availableAfModes[i] == CameraCharacteristics.CONTROL_AF_MODE_CONTINUOUS_PICTURE) {
-                continuousPictureAfModeAvailable = true;
-                break;
-            }
-        }
-        return  isAutoFocusSupported() && continuousPictureAfModeAvailable;
-    }
-
-    @Override
     public boolean isAutoExposureSupported() {
         Integer maxAeRegions = mCameraCharacteristics.get(
               CameraCharacteristics.CONTROL_MAX_REGIONS_AE);
diff --git a/src/com/android/camera/one/v2/OneCameraImpl.java b/src/com/android/camera/one/v2/OneCameraImpl.java
index c3b8ecb0f..d4c7cba01 100644
--- a/src/com/android/camera/one/v2/OneCameraImpl.java
+++ b/src/com/android/camera/one/v2/OneCameraImpl.java
@@ -71,7 +71,6 @@ import com.google.common.base.Optional;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.MoreExecutors;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -513,7 +512,7 @@ public class OneCameraImpl extends AbstractOneCamera {
             public void onFailure(Throwable throwable) {
                 captureParams.callback.onPictureSaved(null);
             }
-        }, MoreExecutors.directExecutor());
+        });
     }
 
     /**
diff --git a/src/com/android/camera/one/v2/OneCameraZslImpl.java b/src/com/android/camera/one/v2/OneCameraZslImpl.java
index a35a6c1b3..5464ab8a9 100644
--- a/src/com/android/camera/one/v2/OneCameraZslImpl.java
+++ b/src/com/android/camera/one/v2/OneCameraZslImpl.java
@@ -71,7 +71,6 @@ import com.google.common.base.Optional;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.MoreExecutors;
 
 import java.nio.ByteBuffer;
 import java.security.InvalidParameterException;
@@ -650,7 +649,7 @@ public class OneCameraZslImpl extends AbstractOneCamera {
             public void onFailure(Throwable throwable) {
                 captureParams.callback.onPictureSaved(null);
             }
-        }, MoreExecutors.directExecutor());
+        });
     }
 
     /**
diff --git a/src/com/android/camera/one/v2/camera2proxy/AndroidImageProxy.java b/src/com/android/camera/one/v2/camera2proxy/AndroidImageProxy.java
index ef9baa530..3dc5d65d3 100644
--- a/src/com/android/camera/one/v2/camera2proxy/AndroidImageProxy.java
+++ b/src/com/android/camera/one/v2/camera2proxy/AndroidImageProxy.java
@@ -19,7 +19,6 @@ package com.android.camera.one.v2.camera2proxy;
 import android.graphics.Rect;
 import android.media.Image;
 
-import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 import com.google.common.collect.ImmutableList;
 
@@ -204,7 +203,7 @@ public class AndroidImageProxy implements ImageProxy {
 
     @Override
     public String toString() {
-        return MoreObjects.toStringHelper(this)
+        return Objects.toStringHelper(this)
                 .add("format", getFormat())
                 .add("timestamp", getTimestamp())
                 .add("width", getWidth())
diff --git a/src/com/android/camera/one/v2/camera2proxy/AndroidImageReaderProxy.java b/src/com/android/camera/one/v2/camera2proxy/AndroidImageReaderProxy.java
index e4c06380b..8a59c8380 100644
--- a/src/com/android/camera/one/v2/camera2proxy/AndroidImageReaderProxy.java
+++ b/src/com/android/camera/one/v2/camera2proxy/AndroidImageReaderProxy.java
@@ -21,7 +21,7 @@ import android.media.Image;
 import android.os.Handler;
 import android.view.Surface;
 
-import com.google.common.base.MoreObjects;
+import com.google.common.base.Objects;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -160,9 +160,9 @@ public final class AndroidImageReaderProxy implements ImageReaderProxy {
 
     @Override
     public String toString() {
-        MoreObjects.ToStringHelper tsh;
+        Objects.ToStringHelper tsh;
         synchronized (mLock) {
-            tsh = MoreObjects.toStringHelper(mDelegate);
+            tsh = Objects.toStringHelper(mDelegate);
         }
         return tsh.add("width", getWidth())
                 .add("height", getHeight())
diff --git a/src/com/android/camera/one/v2/camera2proxy/ForwardingImageProxy.java b/src/com/android/camera/one/v2/camera2proxy/ForwardingImageProxy.java
index 98d972e3d..545ff6008 100644
--- a/src/com/android/camera/one/v2/camera2proxy/ForwardingImageProxy.java
+++ b/src/com/android/camera/one/v2/camera2proxy/ForwardingImageProxy.java
@@ -19,7 +19,6 @@ package com.android.camera.one.v2.camera2proxy;
 import android.graphics.Rect;
 import android.media.Image;
 
-import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 
 import java.util.List;
@@ -103,7 +102,7 @@ public abstract class ForwardingImageProxy implements ImageProxy {
 
     @Override
     public String toString() {
-        return MoreObjects.toStringHelper(this)
+        return Objects.toStringHelper(this)
                 .add("timestamp", getTimestamp())
                 .add("width", getWidth())
                 .add("height", getHeight())
diff --git a/src/com/android/camera/one/v2/common/BasicCameraFactory.java b/src/com/android/camera/one/v2/common/BasicCameraFactory.java
index 44883eade..2cd40984f 100644
--- a/src/com/android/camera/one/v2/common/BasicCameraFactory.java
+++ b/src/com/android/camera/one/v2/common/BasicCameraFactory.java
@@ -87,12 +87,8 @@ public class BasicCameraFactory {
             Observable<Boolean> hdrSceneSetting,
             int templateType) {
         RequestTemplate requestTemplate = new RequestTemplate(rootTemplate);
-        if (cameraCharacteristics.isContinuousPictureAutoFocusSupported()) {
-            requestTemplate.setParam(
-                    CaptureRequest.CONTROL_AF_MODE,
-                    CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE);
-        }
-
+        requestTemplate.setParam(
+              CaptureRequest.CONTROL_AF_MODE, CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE);
         requestTemplate.setParam(
               CaptureRequest.CONTROL_AE_MODE, new FlashBasedAEMode(flash, hdrSceneSetting));
         requestTemplate.setParam(
@@ -130,16 +126,16 @@ public class BasicCameraFactory {
         // Also, de-register these callbacks when the camera is closed (to
         // not leak memory).
         SafeCloseable zoomCallback = zoom.addCallback(mPreviewUpdater, MoreExecutors
-                .directExecutor());
+                .sameThreadExecutor());
         lifetime.add(zoomCallback);
         SafeCloseable flashCallback = flash.addCallback(mPreviewUpdater, MoreExecutors
-                .directExecutor());
+                .sameThreadExecutor());
         lifetime.add(flashCallback);
         SafeCloseable exposureCallback = exposure.addCallback(mPreviewUpdater, MoreExecutors
-                .directExecutor());
+                .sameThreadExecutor());
         lifetime.add(exposureCallback);
         SafeCloseable hdrCallback = hdrSceneSetting.addCallback(mPreviewUpdater, MoreExecutors
-                .directExecutor());
+                .sameThreadExecutor());
         lifetime.add(hdrCallback);
 
         int sensorOrientation = cameraCharacteristics.getSensorOrientation();
diff --git a/src/com/android/camera/one/v2/common/PictureSizeCalculator.java b/src/com/android/camera/one/v2/common/PictureSizeCalculator.java
index 8f2fb6a89..eb25be0e0 100644
--- a/src/com/android/camera/one/v2/common/PictureSizeCalculator.java
+++ b/src/com/android/camera/one/v2/common/PictureSizeCalculator.java
@@ -22,7 +22,6 @@ import com.android.camera.one.OneCameraAccessException;
 import com.android.camera.one.OneCameraCharacteristics;
 import com.android.camera.util.AspectRatio;
 import com.android.camera.util.Size;
-import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
 
@@ -77,7 +76,7 @@ public final class PictureSizeCalculator {
 
         @Override
         public String toString() {
-            return MoreObjects.toStringHelper("PictureSizeCalculator.Configuration")
+            return Objects.toStringHelper("PictureSizeCalculator.Configuration")
                     .add("native size", mSize)
                     .add("crop", mPostCrop)
                     .toString();
diff --git a/src/com/android/camera/one/v2/initialization/GenericOneCameraImpl.java b/src/com/android/camera/one/v2/initialization/GenericOneCameraImpl.java
index 472378f17..f966bfd53 100644
--- a/src/com/android/camera/one/v2/initialization/GenericOneCameraImpl.java
+++ b/src/com/android/camera/one/v2/initialization/GenericOneCameraImpl.java
@@ -35,7 +35,6 @@ import com.android.camera.util.Size;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.MoreExecutors;
 
 import java.util.concurrent.Executor;
 
@@ -160,7 +159,7 @@ class GenericOneCameraImpl implements OneCamera {
             public void onFailure(@Nonnull Throwable throwable) {
                 listener.onSetupFailed();
             }
-        }, MoreExecutors.directExecutor());
+        });
     }
 
     @Override
diff --git a/src/com/android/camera/one/v2/initialization/PreviewStarter.java b/src/com/android/camera/one/v2/initialization/PreviewStarter.java
index 17a0966de..99c34a348 100644
--- a/src/com/android/camera/one/v2/initialization/PreviewStarter.java
+++ b/src/com/android/camera/one/v2/initialization/PreviewStarter.java
@@ -24,7 +24,6 @@ import com.android.camera.util.ApiHelper;
 import com.google.common.util.concurrent.AsyncFunction;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.MoreExecutors;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -83,7 +82,7 @@ class PreviewStarter {
         final ListenableFuture<CameraCaptureSessionProxy> sessionFuture =
                 mCaptureSessionCreator.createCaptureSession(surfaceList);
 
-        return Futures.transformAsync(sessionFuture,
+        return Futures.transform(sessionFuture,
                 new AsyncFunction<CameraCaptureSessionProxy, Void>() {
                     @Override
                     public ListenableFuture<Void> apply(
@@ -91,6 +90,6 @@ class PreviewStarter {
                         mSessionListener.onCameraCaptureSessionCreated(captureSession, surface);
                         return Futures.immediateFuture(null);
                     }
-                }, MoreExecutors.directExecutor());
+                });
     }
 }
diff --git a/src/com/android/camera/one/v2/photo/PictureTakerImpl.java b/src/com/android/camera/one/v2/photo/PictureTakerImpl.java
index 59245daf4..13498c7cc 100644
--- a/src/com/android/camera/one/v2/photo/PictureTakerImpl.java
+++ b/src/com/android/camera/one/v2/photo/PictureTakerImpl.java
@@ -28,7 +28,7 @@ import com.android.camera.one.v2.commands.CameraCommandExecutor;
 import com.android.camera.one.v2.core.ResourceAcquisitionFailedException;
 import com.android.camera.one.v2.imagesaver.ImageSaver;
 import com.android.camera.session.CaptureSession;
-import com.google.common.base.MoreObjects;
+import com.google.common.base.Objects;
 
 class PictureTakerImpl implements PictureTaker {
     private final MainThread mMainExecutor;
@@ -70,7 +70,7 @@ class PictureTakerImpl implements PictureTaker {
 
         @Override
         public String toString() {
-            return MoreObjects.toStringHelper(this)
+            return Objects.toStringHelper(this)
                     .add("command", mCommand)
                     .toString();
         }
diff --git a/src/com/android/camera/one/v2/sharedimagereader/metadatasynchronizer/MetadataPoolImpl.java b/src/com/android/camera/one/v2/sharedimagereader/metadatasynchronizer/MetadataPoolImpl.java
index 5be9032b9..8500ebefa 100644
--- a/src/com/android/camera/one/v2/sharedimagereader/metadatasynchronizer/MetadataPoolImpl.java
+++ b/src/com/android/camera/one/v2/sharedimagereader/metadatasynchronizer/MetadataPoolImpl.java
@@ -25,7 +25,6 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.SettableFuture;
 
 import java.util.HashMap;
@@ -82,7 +81,7 @@ public class MetadataPoolImpl implements Updatable<TotalCaptureResultProxy>, Met
             public void onFailure(Throwable throwable) {
                 throw new UnsupportedOperationException();
             }
-        }, MoreExecutors.directExecutor());
+        });
         return Futures2.nonCancellationPropagating(future);
     }
 
diff --git a/src/com/android/camera/one/v2/sharedimagereader/ringbuffer/DynamicRingBufferFactory.java b/src/com/android/camera/one/v2/sharedimagereader/ringbuffer/DynamicRingBufferFactory.java
index 11350f24a..1530c4890 100644
--- a/src/com/android/camera/one/v2/sharedimagereader/ringbuffer/DynamicRingBufferFactory.java
+++ b/src/com/android/camera/one/v2/sharedimagereader/ringbuffer/DynamicRingBufferFactory.java
@@ -51,7 +51,7 @@ public class DynamicRingBufferFactory {
             public void run() {
                 ringBuffer.setMaxSize(Math.max(0, maxRingBufferSize.get()));
             }
-        }, MoreExecutors.directExecutor()));
+        }, MoreExecutors.sameThreadExecutor()));
         ringBuffer.setMaxSize(Math.max(0, maxRingBufferSize.get()));
 
         mOutputTicketPool = ringBuffer;
diff --git a/src/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java b/src/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java
index c87eab8e8..2e5976c46 100644
--- a/src/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java
+++ b/src/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java
@@ -39,7 +39,6 @@ import com.google.common.base.Optional;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.MoreExecutors;
 
 import java.nio.ByteBuffer;
 import java.util.HashMap;
@@ -356,7 +355,7 @@ public class TaskCompressImageToJpeg extends TaskJpegEncode {
             @Override
             public void onFailure(Throwable throwable) {
             }
-        }, MoreExecutors.directExecutor());
+        });
 
         final ListenableFuture<TotalCaptureResultProxy> requestMetadata = img.metadata;
         // If TotalCaptureResults are available add them to the capture event.
diff --git a/src/com/android/camera/settings/CameraSettingsActivity.java b/src/com/android/camera/settings/CameraSettingsActivity.java
index c2e060a1e..0429092c2 100644
--- a/src/com/android/camera/settings/CameraSettingsActivity.java
+++ b/src/com/android/camera/settings/CameraSettingsActivity.java
@@ -16,12 +16,10 @@
 
 package com.android.camera.settings;
 
-import android.Manifest;
 import android.app.ActionBar;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.os.Bundle;
@@ -71,7 +69,6 @@ public class CameraSettingsActivity extends FragmentActivity {
      */
     public static final String PREF_SCREEN_EXTRA = "pref_screen_extra";
     public static final String HIDE_ADVANCED_SCREEN = "hide_advanced";
-    private static final int PERMISSION_REQUEST_CODE = 1;
     private OneCameraManager mOneCameraManager;
 
     @Override
@@ -358,15 +355,6 @@ public class CameraSettingsActivity extends FragmentActivity {
         @Override
         public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
             setSummary(findPreference(key));
-            if (key.equals(Keys.KEY_RECORD_LOCATION)
-                    && sharedPreferences.getString(key, "0").equals("1")) {
-                Context context = this.getActivity().getApplicationContext();
-                if (context.checkSelfPermission(Manifest.permission.ACCESS_COARSE_LOCATION)
-                        != PackageManager.PERMISSION_GRANTED) {
-                    requestPermissions(new String[] {Manifest.permission.ACCESS_COARSE_LOCATION},
-                        PERMISSION_REQUEST_CODE);
-                }
-            }
         }
 
         /**