From 61e7b52b325b928b985952d18a8c1057a23db091 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sat, 5 Aug 2017 20:42:17 -0700
Subject: [PATCH 01/13] Import translations. DO NOT MERGE

Change-Id: I846a256b0c7f168dac7b372520de7120e9a4cd58
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
---
 library/main/res/values-en-rXC/strings.xml | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 library/main/res/values-en-rXC/strings.xml

diff --git a/library/main/res/values-en-rXC/strings.xml b/library/main/res/values-en-rXC/strings.xml
new file mode 100644
index 0000000..693af6b
--- /dev/null
+++ b/library/main/res/values-en-rXC/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright (C) 2015 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="suw_next_button_label" msgid="7269625133873553978">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‎‎‎‏‎‏‏‏‎‎‏‎‏‏‎‎‎‏‎‏‏‎‎‎‎‏‎‏‎‏‏‎‎‏‎‎‎‏‏‏‎‎‎‏‎‎‎‏‏‏‎‏‎‎Next‎‏‎‎‏‎"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‎‎‎‏‏‎‎‏‎‎‎‎‏‏‎‎‏‏‏‎‏‏‏‏‏‎‎‏‎‎‎‏‏‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎Back‎‏‎‎‏‎"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‎‎‏‎‏‎‎‏‏‎‏‏‎‎‎‎‎‏‏‏‎‎‏‎‎‏‏‏‎‏‏‏‏‎‏‏‎‎‏‎‏‏‏‎‏‎‎‎‎‏‏‎More‎‏‎‎‏‎"</string>
+</resources>

From 5eb4ef5305058172a5f6463b8b76e4805a1d829f Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sat, 5 Aug 2017 20:43:48 -0700
Subject: [PATCH 02/13] Import translations. DO NOT MERGE

Change-Id: Id3562d22d313dc17ff9c7c4d95ceb64ed905d61f
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
---
 navigationbar/res/values-en-rXC/strings.xml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 navigationbar/res/values-en-rXC/strings.xml

diff --git a/navigationbar/res/values-en-rXC/strings.xml b/navigationbar/res/values-en-rXC/strings.xml
new file mode 100644
index 0000000..5c7c658
--- /dev/null
+++ b/navigationbar/res/values-en-rXC/strings.xml
@@ -0,0 +1,6 @@
+<?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="setup_wizard_next_button_label" msgid="6681282266022780599">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‏‏‎‎‎‏‎‏‎‏‏‏‎‏‏‎‏‎‎‏‎‎‏‏‎‏‏‏‎‎‏‏‎‎‏‏‏‏‎‎‏‏‏‏‎‏‎‏‏‎‏‏‏‎Next‎‏‎‎‏‎"</string>
+    <string name="setup_wizard_back_button_label" msgid="2863826823307023546">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‏‏‏‏‎‎‏‎‏‏‎‏‏‎‏‎‏‎‎‏‎‏‎‎‏‎‏‎‏‎‏‏‏‎‎‏‏‎‏‎‏‎‏‎‎‏‎‏‏‏‎‏‎‎Back‎‏‎‎‏‎"</string>
+</resources>

From 0860be3a3740feefe7566a731b726a74d79e97ab Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Thu, 3 Aug 2017 16:02:03 -0700
Subject: [PATCH 03/13] Set status bar color to transparent in "platform"

So that the status bar background drawn by GlifLayout is visible.

Test: ./gradlew test
Bug: 64126435
Change-Id: If089091a08ab80cddc2514e1e929a771f3371373
(cherry picked from commit c072bc26cd2709a2cfcdeb36e3c45c35fdaaf01b)
---
 library/platform/res/values-v23/styles.xml    |  4 ++--
 .../setupwizardlib/util/GlifStyleTest.java    | 21 +++++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/library/platform/res/values-v23/styles.xml b/library/platform/res/values-v23/styles.xml
index 2eb5caf..9fff5f1 100644
--- a/library/platform/res/values-v23/styles.xml
+++ b/library/platform/res/values-v23/styles.xml
@@ -92,7 +92,7 @@
         <item name="android:listPreferredItemPaddingEnd">?attr/suwMarginSides</item>
         <item name="android:listPreferredItemPaddingStart">?attr/suwMarginSides</item>
         <item name="android:navigationBarColor">@android:color/black</item>
-        <item name="android:statusBarColor">?android:attr/colorPrimary</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:textAppearanceListItem">@style/TextAppearance.SuwGlifItemTitle</item>
         <item name="android:textAppearanceListItemSmall">@style/TextAppearance.SuwGlifItemSummary</item>
         <item name="android:textColorLink">@color/suw_color_accent_glif_dark</item>
@@ -124,7 +124,7 @@
         <item name="android:listPreferredItemPaddingEnd">?attr/suwMarginSides</item>
         <item name="android:listPreferredItemPaddingStart">?attr/suwMarginSides</item>
         <item name="android:navigationBarColor">@android:color/black</item>
-        <item name="android:statusBarColor">?android:attr/colorPrimary</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:textAppearanceListItem">@style/TextAppearance.SuwGlifItemTitle</item>
         <item name="android:textAppearanceListItemSmall">@style/TextAppearance.SuwGlifItemSummary</item>
         <item name="android:textColorLink">@color/suw_color_accent_glif_light</item>
diff --git a/library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java b/library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java
index e4e311f..aea2c03 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java
@@ -20,9 +20,13 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.robolectric.RuntimeEnvironment.application;
 
+import android.annotation.TargetApi;
+import android.app.Activity;
 import android.content.Context;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
 import android.view.ContextThemeWrapper;
 import android.widget.Button;
 
@@ -63,4 +67,21 @@ public class GlifStyleTest {
             assertEquals("ff4285f4", Integer.toHexString(button.getTextColors().getDefaultColor()));
         }
     }
+
+    @TargetApi(VERSION_CODES.LOLLIPOP)
+    @Config(sdk = Config.NEWEST_SDK)
+    @Test
+    public void glifThemeLight_statusBarColorShouldBeTransparent() {
+        GlifThemeActivity activity = Robolectric.setupActivity(GlifThemeActivity.class);
+        assertEquals(0x00000000, activity.getWindow().getStatusBarColor());
+    }
+
+    private static class GlifThemeActivity extends Activity {
+
+        @Override
+        protected void onCreate(@Nullable Bundle savedInstanceState) {
+            setTheme(R.style.SuwThemeGlif_Light);
+            super.onCreate(savedInstanceState);
+        }
+    }
 }

From b1d671824517f5303961cf3d802ed515194f9aa6 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Tue, 15 Aug 2017 22:37:46 -0700
Subject: [PATCH 04/13] Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: Ia3952b887f83e1af5e0134455694dec6325b667d
---
 library/main/res/values-en-rCA/strings.xml | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 library/main/res/values-en-rCA/strings.xml

diff --git a/library/main/res/values-en-rCA/strings.xml b/library/main/res/values-en-rCA/strings.xml
new file mode 100644
index 0000000..5260500
--- /dev/null
+++ b/library/main/res/values-en-rCA/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright (C) 2015 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="suw_next_button_label" msgid="7269625133873553978">"Next"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"Back"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"More"</string>
+</resources>

From ee99227e31b161a34cf0c17018ec6abe372b3c1c Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Tue, 15 Aug 2017 22:40:10 -0700
Subject: [PATCH 05/13] Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: Ia5ad7ab3e47ca9f3ba7f07ababfc844e46fe30fd
---
 navigationbar/res/values-en-rCA/strings.xml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 navigationbar/res/values-en-rCA/strings.xml

diff --git a/navigationbar/res/values-en-rCA/strings.xml b/navigationbar/res/values-en-rCA/strings.xml
new file mode 100644
index 0000000..b06dc86
--- /dev/null
+++ b/navigationbar/res/values-en-rCA/strings.xml
@@ -0,0 +1,6 @@
+<?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="setup_wizard_next_button_label" msgid="6681282266022780599">"Next"</string>
+    <string name="setup_wizard_back_button_label" msgid="2863826823307023546">"Back"</string>
+</resources>

From cb38f9b86c595ad8010384c331edcecdbae2dcb3 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Thu, 17 Aug 2017 20:47:22 -0700
Subject: [PATCH 06/13] Add getText to Partner.java

Test: Existing tests pass
Bug: 64547057
Change-Id: Ie98297d50a545952e861f79fba9c680550c64d29
---
 .../android/setupwizardlib/util/Partner.java   | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/library/main/src/com/android/setupwizardlib/util/Partner.java b/library/main/src/com/android/setupwizardlib/util/Partner.java
index d6e4919..67f5546 100644
--- a/library/main/src/com/android/setupwizardlib/util/Partner.java
+++ b/library/main/src/com/android/setupwizardlib/util/Partner.java
@@ -26,6 +26,9 @@ import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
+import android.support.annotation.AnyRes;
+import android.support.annotation.DrawableRes;
+import android.support.annotation.StringRes;
 import android.support.annotation.VisibleForTesting;
 import android.util.Log;
 
@@ -56,7 +59,7 @@ public class Partner {
      *
      * @see #getResourceEntry(android.content.Context, int)
      */
-    public static Drawable getDrawable(Context context, int id) {
+    public static Drawable getDrawable(Context context, @DrawableRes int id) {
         final ResourceEntry entry = getResourceEntry(context, id);
         return entry.resources.getDrawable(entry.id);
     }
@@ -67,11 +70,20 @@ public class Partner {
      *
      * @see #getResourceEntry(android.content.Context, int)
      */
-    public static String getString(Context context, int id) {
+    public static String getString(Context context, @StringRes int id) {
         final ResourceEntry entry = getResourceEntry(context, id);
         return entry.resources.getString(entry.id);
     }
 
+    /**
+     * Convenience method to get a CharSequence from partner overlay, or if not available, the text
+     * from the original context.
+     */
+    public static CharSequence getText(Context context, @StringRes int id) {
+        final ResourceEntry entry = getResourceEntry(context, id);
+        return entry.resources.getText(id);
+    }
+
     /**
      * Find an entry of resource in the overlay package provided by partners. It will first look for
      * the resource in the overlay package, and if not available, will return the one in the
@@ -82,7 +94,7 @@ public class Partner {
      * {@code entry.resources.getString(entry.id)}, or other methods available in
      * {@link android.content.res.Resources}.
      */
-    public static ResourceEntry getResourceEntry(Context context, int id) {
+    public static ResourceEntry getResourceEntry(Context context, @AnyRes int id) {
         final Partner partner = Partner.get(context);
         if (partner != null) {
             final Resources ourResources = context.getResources();

From f24b902f26eb2e1c25736c0f205ac9e215b91099 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Wed, 30 Aug 2017 04:09:55 -0700
Subject: [PATCH 07/13] Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I334f713d0e23b35ceebf9ebeb45308b0dfd004eb
---
 library/main/res/values-hi/strings.xml | 2 +-
 library/main/res/values-mr/strings.xml | 2 +-
 library/main/res/values-te/strings.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/main/res/values-hi/strings.xml b/library/main/res/values-hi/strings.xml
index d30fbb4..a5c27b1 100644
--- a/library/main/res/values-hi/strings.xml
+++ b/library/main/res/values-hi/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="suw_next_button_label" msgid="7269625133873553978">"आगे"</string>
+    <string name="suw_next_button_label" msgid="7269625133873553978">"अगला"</string>
     <string name="suw_back_button_label" msgid="1460929053642711025">"पीछे"</string>
     <string name="suw_more_button_label" msgid="7769076059705546563">"अधिक"</string>
 </resources>
diff --git a/library/main/res/values-mr/strings.xml b/library/main/res/values-mr/strings.xml
index bb9980e..a529655 100644
--- a/library/main/res/values-mr/strings.xml
+++ b/library/main/res/values-mr/strings.xml
@@ -18,6 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="suw_next_button_label" msgid="7269625133873553978">"पुढील"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"परत"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"मागे"</string>
     <string name="suw_more_button_label" msgid="7769076059705546563">"अधिक"</string>
 </resources>
diff --git a/library/main/res/values-te/strings.xml b/library/main/res/values-te/strings.xml
index 4209a3c..b120ee8 100644
--- a/library/main/res/values-te/strings.xml
+++ b/library/main/res/values-te/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="suw_next_button_label" msgid="7269625133873553978">"తదుపరి"</string>
+    <string name="suw_next_button_label" msgid="7269625133873553978">"తర్వాత"</string>
     <string name="suw_back_button_label" msgid="1460929053642711025">"వెనుకకు"</string>
     <string name="suw_more_button_label" msgid="7769076059705546563">"మరింత"</string>
 </resources>

From 25e5987861612aead83b9b01d3d89302a4eebca8 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Wed, 30 Aug 2017 04:12:10 -0700
Subject: [PATCH 08/13] Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I30ae242cd4fbd0e7c555b5abac3489aca51c8920
---
 navigationbar/res/values-hi/strings.xml | 2 +-
 navigationbar/res/values-mr/strings.xml | 2 +-
 navigationbar/res/values-te/strings.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/navigationbar/res/values-hi/strings.xml b/navigationbar/res/values-hi/strings.xml
index 6afe5e5..fc1e9da 100644
--- a/navigationbar/res/values-hi/strings.xml
+++ b/navigationbar/res/values-hi/strings.xml
@@ -1,6 +1,6 @@
 <?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="setup_wizard_next_button_label" msgid="6681282266022780599">"आगे"</string>
+    <string name="setup_wizard_next_button_label" msgid="6681282266022780599">"अगला"</string>
     <string name="setup_wizard_back_button_label" msgid="2863826823307023546">"पीछे"</string>
 </resources>
diff --git a/navigationbar/res/values-mr/strings.xml b/navigationbar/res/values-mr/strings.xml
index 9269807..3668c64 100644
--- a/navigationbar/res/values-mr/strings.xml
+++ b/navigationbar/res/values-mr/strings.xml
@@ -2,5 +2,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="setup_wizard_next_button_label" msgid="6681282266022780599">"पुढील"</string>
-    <string name="setup_wizard_back_button_label" msgid="2863826823307023546">"परत"</string>
+    <string name="setup_wizard_back_button_label" msgid="2863826823307023546">"मागे"</string>
 </resources>
diff --git a/navigationbar/res/values-te/strings.xml b/navigationbar/res/values-te/strings.xml
index e575ba7..fdf5c75 100644
--- a/navigationbar/res/values-te/strings.xml
+++ b/navigationbar/res/values-te/strings.xml
@@ -1,6 +1,6 @@
 <?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="setup_wizard_next_button_label" msgid="6681282266022780599">"తదుపరి"</string>
+    <string name="setup_wizard_next_button_label" msgid="6681282266022780599">"తర్వాత"</string>
     <string name="setup_wizard_back_button_label" msgid="2863826823307023546">"వెనుకకు"</string>
 </resources>

From 616fd7a886200e2366cfc0dca4b9050bf61a6f30 Mon Sep 17 00:00:00 2001
From: Ajay Nadathur <ajayns@google.com>
Date: Thu, 24 Aug 2017 17:26:54 -0700
Subject: [PATCH 09/13] Add API to expose player's current position

bug: 63084868
Test: Manually tested
Change-Id: Ic0807e9acd8ab37b910ecc718f17044eefa80c15
---
 .../android/setupwizardlib/view/IllustrationVideoView.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/library/main/src/com/android/setupwizardlib/view/IllustrationVideoView.java b/library/main/src/com/android/setupwizardlib/view/IllustrationVideoView.java
index 9f1d2e7..9c79eb5 100644
--- a/library/main/src/com/android/setupwizardlib/view/IllustrationVideoView.java
+++ b/library/main/src/com/android/setupwizardlib/view/IllustrationVideoView.java
@@ -233,4 +233,8 @@ public class IllustrationVideoView extends TextureView implements Animatable,
     public void onSeekComplete(MediaPlayer mp) {
         mp.start();
     }
+
+    public int getCurrentPosition() {
+        return mMediaPlayer == null ? 0 : mMediaPlayer.getCurrentPosition();
+    }
 }

From 60d79f70da8fe9c70723c9eda29c5282daff066f Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sat, 16 Sep 2017 04:03:52 -0700
Subject: [PATCH 10/13] Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I25b059a922fd7ace86d5f5a62efab045ead80212
---
 library/main/res/values-bn/strings.xml | 2 +-
 library/main/res/values-hi/strings.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/main/res/values-bn/strings.xml b/library/main/res/values-bn/strings.xml
index d807c08..88865ee 100644
--- a/library/main/res/values-bn/strings.xml
+++ b/library/main/res/values-bn/strings.xml
@@ -19,5 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="suw_next_button_label" msgid="7269625133873553978">"পরবর্তী"</string>
     <string name="suw_back_button_label" msgid="1460929053642711025">"ফিরুন"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"আরো"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"আরও"</string>
 </resources>
diff --git a/library/main/res/values-hi/strings.xml b/library/main/res/values-hi/strings.xml
index a5c27b1..3fb41d3 100644
--- a/library/main/res/values-hi/strings.xml
+++ b/library/main/res/values-hi/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="suw_next_button_label" msgid="7269625133873553978">"अगला"</string>
+    <string name="suw_next_button_label" msgid="7269625133873553978">"आगे बढ़ें"</string>
     <string name="suw_back_button_label" msgid="1460929053642711025">"पीछे"</string>
     <string name="suw_more_button_label" msgid="7769076059705546563">"अधिक"</string>
 </resources>

From dd7f3430521c8feaa4663e3ecc29da5d5697798b Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sat, 16 Sep 2017 04:05:33 -0700
Subject: [PATCH 11/13] Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: Ia6ce0cd073e2734154c88fee99dcd09db7de068f
---
 navigationbar/res/values-hi/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/navigationbar/res/values-hi/strings.xml b/navigationbar/res/values-hi/strings.xml
index fc1e9da..f8e9f9d 100644
--- a/navigationbar/res/values-hi/strings.xml
+++ b/navigationbar/res/values-hi/strings.xml
@@ -1,6 +1,6 @@
 <?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="setup_wizard_next_button_label" msgid="6681282266022780599">"अगला"</string>
+    <string name="setup_wizard_next_button_label" msgid="6681282266022780599">"आगे बढ़ें"</string>
     <string name="setup_wizard_back_button_label" msgid="2863826823307023546">"पीछे"</string>
 </resources>

From 9cefeed367f5d9389562ea623e0143fef6035d87 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sun, 15 Oct 2017 21:22:21 -0700
Subject: [PATCH 12/13] Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: Ia4ee1b669704ec2bd327dd090b225ab61ce0a80a
---
 library/main/res/values-bn/strings.xml | 2 +-
 library/main/res/values-hi/strings.xml | 2 +-
 library/main/res/values-mr/strings.xml | 2 +-
 library/main/res/values-te/strings.xml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/library/main/res/values-bn/strings.xml b/library/main/res/values-bn/strings.xml
index d807c08..88865ee 100644
--- a/library/main/res/values-bn/strings.xml
+++ b/library/main/res/values-bn/strings.xml
@@ -19,5 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="suw_next_button_label" msgid="7269625133873553978">"পরবর্তী"</string>
     <string name="suw_back_button_label" msgid="1460929053642711025">"ফিরুন"</string>
-    <string name="suw_more_button_label" msgid="7769076059705546563">"আরো"</string>
+    <string name="suw_more_button_label" msgid="7769076059705546563">"আরও"</string>
 </resources>
diff --git a/library/main/res/values-hi/strings.xml b/library/main/res/values-hi/strings.xml
index d30fbb4..3fb41d3 100644
--- a/library/main/res/values-hi/strings.xml
+++ b/library/main/res/values-hi/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="suw_next_button_label" msgid="7269625133873553978">"आगे"</string>
+    <string name="suw_next_button_label" msgid="7269625133873553978">"आगे बढ़ें"</string>
     <string name="suw_back_button_label" msgid="1460929053642711025">"पीछे"</string>
     <string name="suw_more_button_label" msgid="7769076059705546563">"अधिक"</string>
 </resources>
diff --git a/library/main/res/values-mr/strings.xml b/library/main/res/values-mr/strings.xml
index bb9980e..a529655 100644
--- a/library/main/res/values-mr/strings.xml
+++ b/library/main/res/values-mr/strings.xml
@@ -18,6 +18,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="suw_next_button_label" msgid="7269625133873553978">"पुढील"</string>
-    <string name="suw_back_button_label" msgid="1460929053642711025">"परत"</string>
+    <string name="suw_back_button_label" msgid="1460929053642711025">"मागे"</string>
     <string name="suw_more_button_label" msgid="7769076059705546563">"अधिक"</string>
 </resources>
diff --git a/library/main/res/values-te/strings.xml b/library/main/res/values-te/strings.xml
index 4209a3c..b120ee8 100644
--- a/library/main/res/values-te/strings.xml
+++ b/library/main/res/values-te/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="suw_next_button_label" msgid="7269625133873553978">"తదుపరి"</string>
+    <string name="suw_next_button_label" msgid="7269625133873553978">"తర్వాత"</string>
     <string name="suw_back_button_label" msgid="1460929053642711025">"వెనుకకు"</string>
     <string name="suw_more_button_label" msgid="7769076059705546563">"మరింత"</string>
 </resources>

From 634dc1fdf2faea0bcc0c45b5472d3c7ec135eb56 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sun, 15 Oct 2017 21:25:34 -0700
Subject: [PATCH 13/13] Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: Ic8128438f4150a1798a22ae8bba42005de9fe09e
---
 navigationbar/res/values-hi/strings.xml | 2 +-
 navigationbar/res/values-mr/strings.xml | 2 +-
 navigationbar/res/values-te/strings.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/navigationbar/res/values-hi/strings.xml b/navigationbar/res/values-hi/strings.xml
index 6afe5e5..f8e9f9d 100644
--- a/navigationbar/res/values-hi/strings.xml
+++ b/navigationbar/res/values-hi/strings.xml
@@ -1,6 +1,6 @@
 <?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="setup_wizard_next_button_label" msgid="6681282266022780599">"आगे"</string>
+    <string name="setup_wizard_next_button_label" msgid="6681282266022780599">"आगे बढ़ें"</string>
     <string name="setup_wizard_back_button_label" msgid="2863826823307023546">"पीछे"</string>
 </resources>
diff --git a/navigationbar/res/values-mr/strings.xml b/navigationbar/res/values-mr/strings.xml
index 9269807..3668c64 100644
--- a/navigationbar/res/values-mr/strings.xml
+++ b/navigationbar/res/values-mr/strings.xml
@@ -2,5 +2,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="setup_wizard_next_button_label" msgid="6681282266022780599">"पुढील"</string>
-    <string name="setup_wizard_back_button_label" msgid="2863826823307023546">"परत"</string>
+    <string name="setup_wizard_back_button_label" msgid="2863826823307023546">"मागे"</string>
 </resources>
diff --git a/navigationbar/res/values-te/strings.xml b/navigationbar/res/values-te/strings.xml
index e575ba7..fdf5c75 100644
--- a/navigationbar/res/values-te/strings.xml
+++ b/navigationbar/res/values-te/strings.xml
@@ -1,6 +1,6 @@
 <?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="setup_wizard_next_button_label" msgid="6681282266022780599">"తదుపరి"</string>
+    <string name="setup_wizard_next_button_label" msgid="6681282266022780599">"తర్వాత"</string>
     <string name="setup_wizard_back_button_label" msgid="2863826823307023546">"వెనుకకు"</string>
 </resources>