diff --git a/samples/AtscTvInput/AndroidManifest.xml b/samples/AtscTvInput/AndroidManifest.xml
index 5fe48e5a0..1d4476193 100644
--- a/samples/AtscTvInput/AndroidManifest.xml
+++ b/samples/AtscTvInput/AndroidManifest.xml
@@ -26,14 +26,14 @@
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
-                <action android:name="android.tv.SetupActivity" />
+                <action android:name="android.media.tv.SetupActivity" />
             </intent-filter>
         </activity>
         <service android:name="com.example.android.atsctvinput.AtscTvInputService"
             android:permission="android.permission.BIND_TV_INPUT"
             android:process=":remoteAtscTvInput">
             <intent-filter>
-                <action android:name="android.tv.TvInputService" />
+                <action android:name="android.media.tv.TvInputService" />
             </intent-filter>
         </service>
     </application>
diff --git a/samples/AtscTvInput/src/com/example/android/atsctvinput/AtscTvInputScanActivity.java b/samples/AtscTvInput/src/com/example/android/atsctvinput/AtscTvInputScanActivity.java
index e8cb6acd1..e4dfe214c 100644
--- a/samples/AtscTvInput/src/com/example/android/atsctvinput/AtscTvInputScanActivity.java
+++ b/samples/AtscTvInput/src/com/example/android/atsctvinput/AtscTvInputScanActivity.java
@@ -18,10 +18,12 @@ package com.example.android.atsctvinput;
 
 import android.app.Activity;
 import android.app.ProgressDialog;
+import android.content.ComponentName;
 import android.content.ContentValues;
+import android.media.tv.TvContract;
+import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.provider.TvContract;
 import android.util.Log;
 import android.util.Pair;
 
@@ -67,11 +69,9 @@ public class AtscTvInputScanActivity extends Activity {
     }
 
     private void clearChannels() {
-        String selection = TvContract.Channels.COLUMN_SERVICE_NAME + " = ?";
-        String[] selectionArgs = new String[] {
-            AtscTvInputService.class.getName()
-        };
-        getContentResolver().delete(TvContract.Channels.CONTENT_URI, selection, selectionArgs);
+        Uri uri = TvContract.buildChannelsUriForInput(
+                new ComponentName(this, AtscTvInputService.class));
+        getContentResolver().delete(uri, null, null);
     }
 
     private void doAutoScan() {
diff --git a/samples/AtscTvInput/src/com/example/android/atsctvinput/AtscTvInputService.java b/samples/AtscTvInput/src/com/example/android/atsctvinput/AtscTvInputService.java
index faefcee24..0d1253110 100644
--- a/samples/AtscTvInput/src/com/example/android/atsctvinput/AtscTvInputService.java
+++ b/samples/AtscTvInput/src/com/example/android/atsctvinput/AtscTvInputService.java
@@ -21,10 +21,10 @@ import android.content.ContentValues;
 import android.content.res.AssetFileDescriptor;
 import android.database.Cursor;
 import android.media.MediaPlayer;
+import android.media.tv.TvContract;
+import android.media.tv.TvInputService;
 import android.net.Uri;
 import android.os.AsyncTask;
-import android.provider.TvContract;
-import android.tv.TvInputService;
 import android.util.Log;
 import android.util.Pair;
 import android.view.Surface;
@@ -159,10 +159,8 @@ public class AtscTvInputService extends TvInputService {
         }
 
         private void clearPrograms(Uri channelUri) {
-            String selection = TvContract.Programs.COLUMN_CHANNEL_ID + " = ?";
-            String[] selectionArgs =
-                    new String[] { Long.toString(ContentUris.parseId(channelUri)) };
-            getContentResolver().delete(TvContract.Programs.CONTENT_URI, selection, selectionArgs);
+            Uri uri = TvContract.buildProgramsUriForChannel(channelUri);
+            getContentResolver().delete(uri, null, null);
         }
 
         private Uri insertProgram(Uri channelUri, EITItem event, long timeOffsetMs) {