diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
index 327c5c1f47..04795f4abe 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
@@ -320,7 +320,9 @@ public class SampleChooserActivity extends Activity {
       View view = convertView;
       if (view == null) {
         view = LayoutInflater.from(context).inflate(R.layout.sample_list_item, parent, false);
-        view.findViewById(R.id.download_button).setOnClickListener(this);
+        View downloadButton = view.findViewById(R.id.download_button);
+        downloadButton.setOnClickListener(this);
+        downloadButton.setFocusable(false);
       }
       initializeChildView(view, getChild(groupPosition, childPosition));
       return view;
diff --git a/library/ui/src/main/res/values-ta/strings.xml b/library/ui/src/main/res/values-ta/strings.xml
index 0862dd22ee..14a0203e06 100644
--- a/library/ui/src/main/res/values-ta/strings.xml
+++ b/library/ui/src/main/res/values-ta/strings.xml
@@ -23,13 +23,13 @@
   <string name="exo_track_selection_title_text">உரை</string>
   <string name="exo_track_selection_none">ஏதுமில்லை</string>
   <string name="exo_track_selection_auto">தானியங்கு</string>
-  <string name="exo_track_unknown">Unknown</string>
+  <string name="exo_track_unknown">தெரியாதவை</string>
   <string name="exo_track_resolution">%1$d × %2$d</string>
-  <string name="exo_track_mono">Mono</string>
-  <string name="exo_track_stereo">Stereo</string>
-  <string name="exo_track_surround">Surround sound</string>
-  <string name="exo_track_surround_5_point_1">5.1 surround sound</string>
-  <string name="exo_track_surround_7_point_1">7.1 surround sound</string>
-  <string name="exo_track_bitrate">%1$.2f Mbps</string>
+  <string name="exo_track_mono">மோனோ</string>
+  <string name="exo_track_stereo">ஸ்டீரியோ</string>
+  <string name="exo_track_surround">சரவுண்ட் சவுண்ட்</string>
+  <string name="exo_track_surround_5_point_1">5.1 சரவுண்ட் சவுண்ட்</string>
+  <string name="exo_track_surround_7_point_1">7.1 சரவுண்ட் சவுண்ட்</string>
+  <string name="exo_track_bitrate">%1$.2f மெ.பை./வி</string>
   <string name="exo_item_list">%1$s, %2$s</string>
 </resources>
diff --git a/library/ui/src/main/res/values-vi/strings.xml b/library/ui/src/main/res/values-vi/strings.xml
index f56d5f5d90..65c9cb52a3 100644
--- a/library/ui/src/main/res/values-vi/strings.xml
+++ b/library/ui/src/main/res/values-vi/strings.xml
@@ -17,7 +17,7 @@
   <string name="exo_download_downloading">Đang tải xuống</string>
   <string name="exo_download_completed">Đã hoàn tất tải xuống</string>
   <string name="exo_download_failed">Không tải xuống được</string>
-  <string name="exo_download_removing">Đang xóa các mục tải xuống</string>
+  <string name="exo_download_removing">Đang xóa các mục đã tải xuống</string>
   <string name="exo_track_selection_title_video">Video</string>
   <string name="exo_track_selection_title_audio">Âm thanh</string>
   <string name="exo_track_selection_title_text">Văn bản</string>