diff --git a/ReferenceAppKotlin/app/src/main/java/com/android/tv/reference/watchnext/WatchNextHelper.kt b/ReferenceAppKotlin/app/src/main/java/com/android/tv/reference/watchnext/WatchNextHelper.kt
index 54d18413e..290a6fd75 100644
--- a/ReferenceAppKotlin/app/src/main/java/com/android/tv/reference/watchnext/WatchNextHelper.kt
+++ b/ReferenceAppKotlin/app/src/main/java/com/android/tv/reference/watchnext/WatchNextHelper.kt
@@ -143,8 +143,6 @@ object WatchNextHelper {
     /**
      * Retrieve all programs in Watch Next row.
      */
-    @SuppressLint("RestrictedApi")
-    // Suppress RestrictedApi due to https://issuetracker.google.com/138150076
     internal fun getWatchNextPrograms(context: Context): List<WatchNextProgram> {
         val programs: MutableList<WatchNextProgram> = mutableListOf()
         val cursor = context.contentResolver.query(
@@ -169,8 +167,6 @@ object WatchNextHelper {
      * Add unfinished program to Watch Next.
      * Update the playback position if program already exists in Watch Next channel.
      */
-    @SuppressLint("RestrictedApi")
-    // Suppress RestrictedApi due to https://issuetracker.google.com/138150076
     @Synchronized
     internal fun insertOrUpdateVideoToWatchNext(
         video: Video,
@@ -247,8 +243,6 @@ object WatchNextHelper {
      *  Returns the number of rows deleted or null if delete fails
      */
     @Synchronized
-    @SuppressLint("RestrictedApi")
-    // Suppress RestrictedApi due to https://issuetracker.google.com/138150076
     fun removeVideoFromWatchNext(context: Context, video: Video): Uri? {
         Timber.v("Trying to Removing content from Watch Next: ${video.name}")
 
@@ -280,8 +274,6 @@ object WatchNextHelper {
     }
 
     @Synchronized
-    @SuppressLint("RestrictedApi")
-    // Suppress RestrictedApi due to https://issuetracker.google.com/138150076
     fun removeVideosFromWatchNext(context: Context, videos: List<Video>) {
         // Find the program with the matching ID for our metadata.
         val foundPrograms = getWatchNextProgramByVideoIds(videos.map { it.id }, context)
@@ -311,8 +303,6 @@ object WatchNextHelper {
     }
 
     @Synchronized
-    @SuppressLint("RestrictedApi")
-    // Suppress RestrictedApi due to https://issuetracker.google.com/138150076
     private fun getWatchNextProgramByVideoIds(ids: List<String>, context: Context):
         List<WatchNextProgram> {
         return getWatchNextPrograms(context).filter {
@@ -324,8 +314,6 @@ object WatchNextHelper {
      * Find the Watch Next program for given id.
      * Returns the first instance available.
      */
-    @SuppressLint("RestrictedApi")
-    // Suppress RestrictedApi due to https://issuetracker.google.com/138150076
     internal fun findFirstWatchNextProgram(context: Context, predicate: (Cursor) -> Boolean):
         WatchNextProgram? {
 
@@ -351,7 +339,6 @@ object WatchNextHelper {
     /**
      *  Returns a list of videos which is visible on Watch Next row.
      */
-    @SuppressLint("RestrictedApi")
     internal fun filterWatchNextVideos(videos: List<Video>, context: Context): List<Video> {
         val watchedPrograms = getWatchNextProgramByVideoIds(videos.map { it.id }, context)
         val watchedVideosIds = watchedPrograms.map { it.internalProviderId }
diff --git a/ReferenceAppKotlin/app/src/main/java/com/android/tv/reference/watchnext/WatchNextWorker.kt b/ReferenceAppKotlin/app/src/main/java/com/android/tv/reference/watchnext/WatchNextWorker.kt
index 5790db235..1081d524c 100644
--- a/ReferenceAppKotlin/app/src/main/java/com/android/tv/reference/watchnext/WatchNextWorker.kt
+++ b/ReferenceAppKotlin/app/src/main/java/com/android/tv/reference/watchnext/WatchNextWorker.kt
@@ -39,8 +39,6 @@ class WatchNextWorker(private val context: Context, params: WorkerParameters) :
      * Events triggered from player state change events &
      * playback lifecycle events (onPause) are consumed here.
      */
-    @SuppressLint("RestrictedApi")
-    // Suppress RestrictedApi due to https://b.corp.google.com/issues/138150076
     override fun doWork(): Result {
 
         // Step 1 : get the video information from the "inputData".
diff --git a/ReferenceAppKotlin/app/src/test/java/com/android/tv/reference/watchnext/WatchNextTest.kt b/ReferenceAppKotlin/app/src/test/java/com/android/tv/reference/watchnext/WatchNextTest.kt
index 69cc9e308..98b426583 100644
--- a/ReferenceAppKotlin/app/src/test/java/com/android/tv/reference/watchnext/WatchNextTest.kt
+++ b/ReferenceAppKotlin/app/src/test/java/com/android/tv/reference/watchnext/WatchNextTest.kt
@@ -398,20 +398,24 @@ class WatchNextTest {
             // Insert a new row.
             rowId++
 
-            val programBuilder = WatchNextProgram.Builder()
-                .setId(rowId)
-                .setTitle(values?.getAsString(TvContractCompat.WatchNextPrograms.COLUMN_TITLE))
-                .setInternalProviderId(
-                    values?.getAsString(
-                        TvContractCompat.WatchNextPrograms
-                            .COLUMN_INTERNAL_PROVIDER_ID
-                    )
-                )
-                .setLastPlaybackPositionMillis(
-                    values!!.getAsInteger(
-                        TvContractCompat.WatchNextPrograms.COLUMN_LAST_PLAYBACK_POSITION_MILLIS
-                    )
-                )
+            val programBuilder =
+                values?.getAsString(TvContractCompat.WatchNextPrograms.COLUMN_TITLE)?.let {
+                    WatchNextProgram.Builder()
+                        .setId(rowId)
+                        .setTitle(it)
+                        .setInternalProviderId(
+                            values.getAsString(
+                                TvContractCompat.WatchNextPrograms
+                                    .COLUMN_INTERNAL_PROVIDER_ID
+                            )
+                        )
+                        .setLastPlaybackPositionMillis(
+                            values!!.getAsInteger(
+                                TvContractCompat.WatchNextPrograms.COLUMN_LAST_PLAYBACK_POSITION_MILLIS
+                            )
+                        )
+                }
+
 
             values.getAsInteger(
                 TvContractCompat.WatchNextPrograms.COLUMN_SEASON_DISPLAY_NUMBER
@@ -483,26 +487,31 @@ class WatchNextTest {
         ): Int {
             val id = uri.lastPathSegment?.toLong() ?: return 0
 
-            val program = WatchNextProgram.Builder()
-                .setId(id)
-                .setTitle(values?.getAsString(TvContractCompat.WatchNextPrograms.COLUMN_TITLE))
-                .setInternalProviderId(
-                    values?.getAsString(
-                        TvContractCompat
-                            .WatchNextPrograms.COLUMN_INTERNAL_PROVIDER_ID
+            val program = values?.getAsString(
+                TvContractCompat
+                    .WatchNextPrograms.COLUMN_INTERNAL_PROVIDER_ID
+            )?.let {
+                WatchNextProgram.Builder()
+                    .setId(id)
+                    .setTitle(values.getAsString(TvContractCompat.WatchNextPrograms.COLUMN_TITLE))
+                    .setInternalProviderId(
+                        it
                     )
-                )
-                .setLastPlaybackPositionMillis(
-                    values!!.getAsInteger(
-                        TvContractCompat.WatchNextPrograms.COLUMN_LAST_PLAYBACK_POSITION_MILLIS
+                    .setLastPlaybackPositionMillis(
+                        values.getAsInteger(
+                            TvContractCompat.WatchNextPrograms.COLUMN_LAST_PLAYBACK_POSITION_MILLIS
+                        )
+
                     )
-                )
-                .build()
+                    .build()
+            }
 
             // Since kotlin collections don't directly provide a replace function, for testing
             // purpose, remove existing and add new entry to avoid complexity.
             this.valuesInMemory.removeIf { it.id == id }
-            this.valuesInMemory.add(program)
+            if (program != null) {
+                this.valuesInMemory.add(program)
+            }
             return 1
         }