diff --git a/samples/wearable/AgendaData/Wearable/src/main/AndroidManifest.xml b/samples/wearable/AgendaData/Wearable/src/main/AndroidManifest.xml
index 2bb042ddc..f6fdae340 100644
--- a/samples/wearable/AgendaData/Wearable/src/main/AndroidManifest.xml
+++ b/samples/wearable/AgendaData/Wearable/src/main/AndroidManifest.xml
@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="com.example.android.wearable.agendadata" >
 
+    <uses-feature android:name="android.hardware.type.watch" />
+
     <application
             android:icon="@drawable/ic_launcher"
             android:label="@string/app_name"
diff --git a/samples/wearable/DataLayer/Wearable/src/main/AndroidManifest.xml b/samples/wearable/DataLayer/Wearable/src/main/AndroidManifest.xml
index 42541cbb9..b0357ffd7 100644
--- a/samples/wearable/DataLayer/Wearable/src/main/AndroidManifest.xml
+++ b/samples/wearable/DataLayer/Wearable/src/main/AndroidManifest.xml
@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="com.example.android.wearable.datalayer" >
 
+    <uses-feature android:name="android.hardware.type.watch" />
+
     <application
             android:allowBackup="true"
             android:icon="@drawable/ic_launcher"
diff --git a/samples/wearable/DelayedConfirmation/Wearable/src/main/AndroidManifest.xml b/samples/wearable/DelayedConfirmation/Wearable/src/main/AndroidManifest.xml
index 81bda1be7..965d89ef0 100644
--- a/samples/wearable/DelayedConfirmation/Wearable/src/main/AndroidManifest.xml
+++ b/samples/wearable/DelayedConfirmation/Wearable/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="com.example.android.wearable.delayedconfirmation" >
 
-    <uses-sdk android:minSdkVersion="20" android:targetSdkVersion="20" />
+    <uses-feature android:name="android.hardware.type.watch" />
 
     <application
             android:allowBackup="true"
diff --git a/samples/wearable/EmbeddedApp/Wearable/src/main/AndroidManifest.xml b/samples/wearable/EmbeddedApp/Wearable/src/main/AndroidManifest.xml
index ebb0e09d6..2ec0c7699 100644
--- a/samples/wearable/EmbeddedApp/Wearable/src/main/AndroidManifest.xml
+++ b/samples/wearable/EmbeddedApp/Wearable/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.android.wearable.embeddedapp" >
 
-    <uses-sdk android:minSdkVersion="18" android:targetSdkVersion="20" />
+    <uses-feature android:name="android.hardware.type.watch" />
 
     <application
         android:allowBackup="true"
diff --git a/samples/wearable/FindMyPhone/Wearable/src/main/AndroidManifest.xml b/samples/wearable/FindMyPhone/Wearable/src/main/AndroidManifest.xml
index d01491ed0..7a8404428 100644
--- a/samples/wearable/FindMyPhone/Wearable/src/main/AndroidManifest.xml
+++ b/samples/wearable/FindMyPhone/Wearable/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
     package="com.example.android.wearable.findphone" >
 
     <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-feature android:name="android.hardware.type.watch" />
 
     <application
             android:allowBackup="true"
diff --git a/samples/wearable/Flashlight/Wearable/src/main/AndroidManifest.xml b/samples/wearable/Flashlight/Wearable/src/main/AndroidManifest.xml
index a9490e0f2..1cec87180 100644
--- a/samples/wearable/Flashlight/Wearable/src/main/AndroidManifest.xml
+++ b/samples/wearable/Flashlight/Wearable/src/main/AndroidManifest.xml
@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.example.android.wearable.flashlight" >
 
+    <uses-feature android:name="android.hardware.type.watch" />
+
     <application
             android:label="@string/app_name"
             android:icon="@drawable/ic_launcher"
diff --git a/samples/wearable/Geofencing/Wearable/src/main/AndroidManifest.xml b/samples/wearable/Geofencing/Wearable/src/main/AndroidManifest.xml
index f96011e9b..33a32b0f7 100644
--- a/samples/wearable/Geofencing/Wearable/src/main/AndroidManifest.xml
+++ b/samples/wearable/Geofencing/Wearable/src/main/AndroidManifest.xml
@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="com.example.android.wearable.geofencing" >
 
+    <uses-feature android:name="android.hardware.type.watch" />
+
     <application
             android:icon="@drawable/ic_launcher"
             android:label="@string/app_name"
diff --git a/samples/wearable/GridViewPager/Wearable/src/main/AndroidManifest.xml b/samples/wearable/GridViewPager/Wearable/src/main/AndroidManifest.xml
index 9ce63ff6c..8e528195d 100644
--- a/samples/wearable/GridViewPager/Wearable/src/main/AndroidManifest.xml
+++ b/samples/wearable/GridViewPager/Wearable/src/main/AndroidManifest.xml
@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.android.wearable.gridviewpager" >
 
+    <uses-feature android:name="android.hardware.type.watch" />
+
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
diff --git a/samples/wearable/JumpingJack/Wearable/src/main/AndroidManifest.xml b/samples/wearable/JumpingJack/Wearable/src/main/AndroidManifest.xml
index 0be9b0614..9ce8e8b4e 100644
--- a/samples/wearable/JumpingJack/Wearable/src/main/AndroidManifest.xml
+++ b/samples/wearable/JumpingJack/Wearable/src/main/AndroidManifest.xml
@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.example.android.wearable.jumpingjack">
 
+    <uses-feature android:name="android.hardware.type.watch" />
+
     <uses-permission android:name="android.permission.VIBRATE"/>
 
     <application
diff --git a/samples/wearable/Notifications/Wearable/src/main/AndroidManifest.xml b/samples/wearable/Notifications/Wearable/src/main/AndroidManifest.xml
index 7bcf0b60f..4ac04f4af 100644
--- a/samples/wearable/Notifications/Wearable/src/main/AndroidManifest.xml
+++ b/samples/wearable/Notifications/Wearable/src/main/AndroidManifest.xml
@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="com.example.android.support.wearable.notifications" >
 
+    <uses-feature android:name="android.hardware.type.watch" />
+
     <application
             android:allowBackup="true"
             android:icon="@mipmap/ic_launcher"
diff --git a/samples/wearable/Quiz/Wearable/src/main/AndroidManifest.xml b/samples/wearable/Quiz/Wearable/src/main/AndroidManifest.xml
index 82e5211c5..ecdfd3bcc 100644
--- a/samples/wearable/Quiz/Wearable/src/main/AndroidManifest.xml
+++ b/samples/wearable/Quiz/Wearable/src/main/AndroidManifest.xml
@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.android.wearable.quiz" >
 
+    <uses-feature android:name="android.hardware.type.watch" />
+
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
diff --git a/samples/wearable/SkeletonWearableApp/Wearable/src/main/AndroidManifest.xml b/samples/wearable/SkeletonWearableApp/Wearable/src/main/AndroidManifest.xml
index cd684061a..6b287bfdd 100644
--- a/samples/wearable/SkeletonWearableApp/Wearable/src/main/AndroidManifest.xml
+++ b/samples/wearable/SkeletonWearableApp/Wearable/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="com.example.android.google.wearable.app" >
 
-    <uses-sdk android:minSdkVersion="20" android:targetSdkVersion="20" />
+    <uses-feature android:name="android.hardware.type.watch" />
 
     <application
             android:allowBackup="true"
diff --git a/samples/wearable/SynchronizedNotifications/Wearable/src/main/AndroidManifest.xml b/samples/wearable/SynchronizedNotifications/Wearable/src/main/AndroidManifest.xml
index ec2f7fee0..cbf546d82 100644
--- a/samples/wearable/SynchronizedNotifications/Wearable/src/main/AndroidManifest.xml
+++ b/samples/wearable/SynchronizedNotifications/Wearable/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.android.wearable.synchronizednotifications" >
 
-    <uses-sdk android:minSdkVersion="20" android:targetSdkVersion="20" />
+    <uses-feature android:name="android.hardware.type.watch" />
 
     <application
         android:allowBackup="true"
diff --git a/samples/wearable/Timer/Wearable/src/main/AndroidManifest.xml b/samples/wearable/Timer/Wearable/src/main/AndroidManifest.xml
index 423218c2e..56a281d50 100644
--- a/samples/wearable/Timer/Wearable/src/main/AndroidManifest.xml
+++ b/samples/wearable/Timer/Wearable/src/main/AndroidManifest.xml
@@ -17,6 +17,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="com.example.android.wearable.timer" >
 
+    <uses-feature android:name="android.hardware.type.watch" />
+
     <application
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_name"
diff --git a/samples/wearable/WatchViewStub/Wearable/src/main/AndroidManifest.xml b/samples/wearable/WatchViewStub/Wearable/src/main/AndroidManifest.xml
index ea6d7b225..b9c9ecf2b 100644
--- a/samples/wearable/WatchViewStub/Wearable/src/main/AndroidManifest.xml
+++ b/samples/wearable/WatchViewStub/Wearable/src/main/AndroidManifest.xml
@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="com.example.android.google.wearable.watchviewstub" >
 
+    <uses-feature android:name="android.hardware.type.watch" />
+
     <application
             android:allowBackup="true"
             android:icon="@drawable/ic_launcher"