diff --git a/app/src/main/java/org/oppia/android/app/activity/ActivityIntentFactories.kt b/app/src/main/java/org/oppia/android/app/activity/ActivityIntentFactories.kt
index ab6ab90bf77..078032aabcf 100644
--- a/app/src/main/java/org/oppia/android/app/activity/ActivityIntentFactories.kt
+++ b/app/src/main/java/org/oppia/android/app/activity/ActivityIntentFactories.kt
@@ -16,15 +16,23 @@ interface ActivityIntentFactories {
    * This must be injected within an activity context.
    */
   interface TopicActivityIntentFactory {
-    /** Returns a new [Intent] to start the topic activity for the specified profile and topic. */
-    fun createIntent(profileId: ProfileId, topicId: String): Intent
+    /**
+     * Returns a new [Intent] to start the topic activity for the specified profile, classroom
+     * and topic.
+     */
+    fun createIntent(profileId: ProfileId, classroomId: String, topicId: String): Intent
 
     /**
-     * Returns a new [Intent] to start the topic activity for the specified profile, topic, and
-     * story (where the activity will automatically navigate to & expand the specified story in the
-     * topic).
+     * Returns a new [Intent] to start the topic activity for the specified profile, classroom,
+     * topic, and story (where the activity will automatically navigate to & expand the specified
+     * story in the topic).
      */
-    fun createIntent(profileId: ProfileId, topicId: String, storyId: String): Intent
+    fun createIntent(
+      profileId: ProfileId,
+      classroomId: String,
+      topicId: String,
+      storyId: String
+    ): Intent
   }
 
   /**
diff --git a/app/src/main/java/org/oppia/android/app/classroom/ClassroomListActivity.kt b/app/src/main/java/org/oppia/android/app/classroom/ClassroomListActivity.kt
index 4ba06da7d58..c8f075f10bf 100644
--- a/app/src/main/java/org/oppia/android/app/classroom/ClassroomListActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/classroom/ClassroomListActivity.kt
@@ -19,7 +19,8 @@ import org.oppia.android.app.model.ProfileId
 import org.oppia.android.app.model.RecentlyPlayedActivityParams
 import org.oppia.android.app.model.RecentlyPlayedActivityTitle
 import org.oppia.android.app.model.ScreenName.CLASSROOM_LIST_ACTIVITY
-import org.oppia.android.app.topic.TopicActivity
+import org.oppia.android.app.topic.TopicActivity.Companion.createTopicActivityIntent
+import org.oppia.android.app.topic.TopicActivity.Companion.createTopicPlayStoryActivityIntent
 import org.oppia.android.app.translation.AppLanguageResourceHandler
 import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.decorateWithScreenName
 import org.oppia.android.util.profile.CurrentUserProfileIdIntentDecorator.decorateWithUserProfileId
@@ -98,15 +99,23 @@ class ClassroomListActivity :
     )
   }
 
-  override fun routeToTopic(internalProfileId: Int, topicId: String) {
-    startActivity(TopicActivity.createTopicActivityIntent(this, internalProfileId, topicId))
+  override fun routeToTopic(internalProfileId: Int, classroomId: String, topicId: String) {
+    startActivity(
+      createTopicActivityIntent(this, internalProfileId, classroomId, topicId)
+    )
   }
 
-  override fun routeToTopicPlayStory(internalProfileId: Int, topicId: String, storyId: String) {
+  override fun routeToTopicPlayStory(
+    internalProfileId: Int,
+    classroomId: String,
+    topicId: String,
+    storyId: String
+  ) {
     startActivity(
-      TopicActivity.createTopicPlayStoryActivityIntent(
+      createTopicPlayStoryActivityIntent(
         this,
         internalProfileId,
+        classroomId,
         topicId,
         storyId
       )
diff --git a/app/src/main/java/org/oppia/android/app/classroom/ClassroomListFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/classroom/ClassroomListFragmentPresenter.kt
index d92830046e5..0ce155bb93a 100644
--- a/app/src/main/java/org/oppia/android/app/classroom/ClassroomListFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/classroom/ClassroomListFragmentPresenter.kt
@@ -28,6 +28,7 @@ import androidx.compose.ui.res.integerResource
 import androidx.compose.ui.unit.dp
 import androidx.databinding.ObservableList
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.Observer
 import org.oppia.android.R
 import org.oppia.android.app.classroom.classroomlist.AllClassroomsHeaderText
 import org.oppia.android.app.classroom.classroomlist.ClassroomList
@@ -43,6 +44,7 @@ import org.oppia.android.app.home.classroomlist.ClassroomSummaryViewModel
 import org.oppia.android.app.home.promotedlist.PromotedStoryListViewModel
 import org.oppia.android.app.home.topiclist.AllTopicsViewModel
 import org.oppia.android.app.home.topiclist.TopicSummaryViewModel
+import org.oppia.android.app.model.AppStartupState
 import org.oppia.android.app.model.ClassroomSummary
 import org.oppia.android.app.model.LessonThumbnail
 import org.oppia.android.app.model.LessonThumbnailGraphic
@@ -51,10 +53,14 @@ import org.oppia.android.app.translation.AppLanguageResourceHandler
 import org.oppia.android.app.utility.datetime.DateTimeUtil
 import org.oppia.android.databinding.ClassroomListFragmentBinding
 import org.oppia.android.domain.classroom.ClassroomController
+import org.oppia.android.domain.onboarding.AppStartupStateController
 import org.oppia.android.domain.oppialogger.OppiaLogger
+import org.oppia.android.domain.oppialogger.analytics.AnalyticsController
 import org.oppia.android.domain.profile.ProfileManagementController
 import org.oppia.android.domain.topic.TopicListController
 import org.oppia.android.domain.translation.TranslationController
+import org.oppia.android.util.data.AsyncResult
+import org.oppia.android.util.data.DataProviders.Companion.toLiveData
 import org.oppia.android.util.locale.OppiaLocale
 import org.oppia.android.util.parser.html.StoryHtmlParserEntityType
 import org.oppia.android.util.parser.html.TopicHtmlParserEntityType
@@ -78,6 +84,8 @@ class ClassroomListFragmentPresenter @Inject constructor(
   private val dateTimeUtil: DateTimeUtil,
   private val translationController: TranslationController,
   private val machineLocale: OppiaLocale.MachineLocale,
+  private val appStartupStateController: AppStartupStateController,
+  private val analyticsController: AnalyticsController,
 ) {
   private val routeToTopicPlayStoryListener = activity as RouteToTopicPlayStoryListener
   private lateinit var binding: ClassroomListFragmentBinding
@@ -95,6 +103,8 @@ class ClassroomListFragmentPresenter @Inject constructor(
 
     internalProfileId = profileId.internalId
 
+    logHomeActivityEvent()
+
     classroomListViewModel = ClassroomListViewModel(
       activity,
       fragment,
@@ -147,6 +157,8 @@ class ClassroomListFragmentPresenter @Inject constructor(
       }
     )
 
+    logAppOnboardedEvent()
+
     return binding.root
   }
 
@@ -154,6 +166,7 @@ class ClassroomListFragmentPresenter @Inject constructor(
   fun onTopicSummaryClicked(topicSummary: TopicSummary) {
     routeToTopicPlayStoryListener.routeToTopicPlayStory(
       internalProfileId,
+      topicSummary.classroomId,
       topicSummary.topicId,
       topicSummary.firstStoryId
     )
@@ -237,6 +250,45 @@ class ClassroomListFragmentPresenter @Inject constructor(
       }
     }
   }
+
+  private fun logAppOnboardedEvent() {
+    val startupStateProvider = appStartupStateController.getAppStartupState()
+    val liveData = startupStateProvider.toLiveData()
+    liveData.observe(
+      activity,
+      object : Observer<AsyncResult<AppStartupState>> {
+        override fun onChanged(startUpStateResult: AsyncResult<AppStartupState>?) {
+          when (startUpStateResult) {
+            null, is AsyncResult.Pending -> {
+              // Do nothing.
+            }
+            is AsyncResult.Success -> {
+              liveData.removeObserver(this)
+
+              if (startUpStateResult.value.startupMode ==
+                AppStartupState.StartupMode.USER_NOT_YET_ONBOARDED
+              ) {
+                analyticsController.logAppOnboardedEvent(profileId)
+              }
+            }
+            is AsyncResult.Failure -> {
+              oppiaLogger.e(
+                "ClassroomListFragment",
+                "Failed to retrieve app startup state"
+              )
+            }
+          }
+        }
+      }
+    )
+  }
+
+  private fun logHomeActivityEvent() {
+    analyticsController.logImportantEvent(
+      oppiaLogger.createOpenHomeContext(),
+      profileId
+    )
+  }
 }
 
 /** Adds a grid of items to a LazyListScope with specified arrangement and item content. */
diff --git a/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryItemViewModel.kt b/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryItemViewModel.kt
index 355389d59b5..6e8507554c0 100644
--- a/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryItemViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryItemViewModel.kt
@@ -31,13 +31,24 @@ class CompletedStoryItemViewModel(
 
   /** Called when user clicks on CompletedStoryItem. */
   fun onCompletedStoryItemClicked() {
-    routeToTopicPlayStory(internalProfileId, completedStory.topicId, completedStory.storyId)
+    routeToTopicPlayStory(
+      internalProfileId,
+      completedStory.classroomId,
+      completedStory.topicId,
+      completedStory.storyId
+    )
   }
 
-  override fun routeToTopicPlayStory(internalProfileId: Int, topicId: String, storyId: String) {
+  override fun routeToTopicPlayStory(
+    internalProfileId: Int,
+    classroomId: String,
+    topicId: String,
+    storyId: String
+  ) {
     val intent = intentFactoryShim.createTopicPlayStoryActivityIntent(
       activity.applicationContext,
       internalProfileId,
+      classroomId,
       topicId,
       storyId
     )
diff --git a/app/src/main/java/org/oppia/android/app/home/HomeActivity.kt b/app/src/main/java/org/oppia/android/app/home/HomeActivity.kt
index 8d6f828abd0..34885717a33 100644
--- a/app/src/main/java/org/oppia/android/app/home/HomeActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/home/HomeActivity.kt
@@ -67,8 +67,10 @@ class HomeActivity :
     homeActivityPresenter.handleOnRestart()
   }
 
-  override fun routeToTopic(internalProfileId: Int, topicId: String) {
-    startActivity(TopicActivity.createTopicActivityIntent(this, internalProfileId, topicId))
+  override fun routeToTopic(internalProfileId: Int, classroomId: String, topicId: String) {
+    startActivity(
+      TopicActivity.createTopicActivityIntent(this, internalProfileId, classroomId, topicId)
+    )
   }
 
   override fun onBackPressed() {
@@ -87,11 +89,17 @@ class HomeActivity :
     dialogFragment.showNow(supportFragmentManager, TAG_SWITCH_PROFILE_DIALOG)
   }
 
-  override fun routeToTopicPlayStory(internalProfileId: Int, topicId: String, storyId: String) {
+  override fun routeToTopicPlayStory(
+    internalProfileId: Int,
+    classroomId: String,
+    topicId: String,
+    storyId: String
+  ) {
     startActivity(
       TopicActivity.createTopicPlayStoryActivityIntent(
         this,
         internalProfileId,
+        classroomId,
         topicId,
         storyId
       )
diff --git a/app/src/main/java/org/oppia/android/app/home/HomeFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/home/HomeFragmentPresenter.kt
index 64d53c68009..b3ef5d04e3f 100644
--- a/app/src/main/java/org/oppia/android/app/home/HomeFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/home/HomeFragmentPresenter.kt
@@ -197,6 +197,7 @@ class HomeFragmentPresenter @Inject constructor(
   fun onTopicSummaryClicked(topicSummary: TopicSummary) {
     routeToTopicPlayStoryListener.routeToTopicPlayStory(
       internalProfileId,
+      topicSummary.classroomId,
       topicSummary.topicId,
       topicSummary.firstStoryId
     )
diff --git a/app/src/main/java/org/oppia/android/app/home/RouteToExplorationListener.kt b/app/src/main/java/org/oppia/android/app/home/RouteToExplorationListener.kt
index 3c8081a3152..9523938373d 100755
--- a/app/src/main/java/org/oppia/android/app/home/RouteToExplorationListener.kt
+++ b/app/src/main/java/org/oppia/android/app/home/RouteToExplorationListener.kt
@@ -7,6 +7,7 @@ import org.oppia.android.app.model.ProfileId
 interface RouteToExplorationListener {
   fun routeToExploration(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
diff --git a/app/src/main/java/org/oppia/android/app/home/RouteToTopicListener.kt b/app/src/main/java/org/oppia/android/app/home/RouteToTopicListener.kt
index 36c7a1a1d94..c00a7dc8389 100755
--- a/app/src/main/java/org/oppia/android/app/home/RouteToTopicListener.kt
+++ b/app/src/main/java/org/oppia/android/app/home/RouteToTopicListener.kt
@@ -2,5 +2,5 @@ package org.oppia.android.app.home
 
 /** Listener for when an activity should route to a topic. */
 interface RouteToTopicListener {
-  fun routeToTopic(internalProfileId: Int, topicId: String)
+  fun routeToTopic(internalProfileId: Int, classroomId: String, topicId: String)
 }
diff --git a/app/src/main/java/org/oppia/android/app/home/RouteToTopicPlayStoryListener.kt b/app/src/main/java/org/oppia/android/app/home/RouteToTopicPlayStoryListener.kt
index aa7121f1c07..4d45619ede8 100755
--- a/app/src/main/java/org/oppia/android/app/home/RouteToTopicPlayStoryListener.kt
+++ b/app/src/main/java/org/oppia/android/app/home/RouteToTopicPlayStoryListener.kt
@@ -2,5 +2,10 @@ package org.oppia.android.app.home
 
 /** Listener for when an activity should route to a story-item in TopicPlay tab. */
 interface RouteToTopicPlayStoryListener {
-  fun routeToTopicPlayStory(internalProfileId: Int, topicId: String, storyId: String)
+  fun routeToTopicPlayStory(
+    internalProfileId: Int,
+    classroomId: String,
+    topicId: String,
+    storyId: String
+  )
 }
diff --git a/app/src/main/java/org/oppia/android/app/home/promotedlist/PromotedStoryViewModel.kt b/app/src/main/java/org/oppia/android/app/home/promotedlist/PromotedStoryViewModel.kt
index 6b300f6355d..dae19f0866e 100755
--- a/app/src/main/java/org/oppia/android/app/home/promotedlist/PromotedStoryViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/home/promotedlist/PromotedStoryViewModel.kt
@@ -63,6 +63,7 @@ class PromotedStoryViewModel(
   fun clickOnStoryTile() {
     routeToTopicPlayStoryListener.routeToTopicPlayStory(
       internalProfileId,
+      promotedStory.classroomId,
       promotedStory.topicId,
       promotedStory.storyId
     )
diff --git a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivity.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivity.kt
index bf852642259..3450d510fbe 100644
--- a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivity.kt
@@ -62,6 +62,7 @@ class RecentlyPlayedActivity :
 
   override fun routeToExploration(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -72,6 +73,7 @@ class RecentlyPlayedActivity :
       ExplorationActivity.createExplorationActivityIntent(
         this,
         profileId,
+        classroomId,
         topicId,
         storyId,
         explorationId,
@@ -83,6 +85,7 @@ class RecentlyPlayedActivity :
 
   override fun routeToResumeLesson(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -93,6 +96,7 @@ class RecentlyPlayedActivity :
       ResumeLessonActivity.createResumeLessonActivityIntent(
         this,
         profileId,
+        classroomId,
         topicId,
         storyId,
         explorationId,
diff --git a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragmentPresenter.kt
index fcd8a8b3c7c..98b7617e0eb 100755
--- a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragmentPresenter.kt
@@ -108,6 +108,7 @@ class RecentlyPlayedFragmentPresenter @Inject constructor(
               explorationCheckpointLiveData.removeObserver(this)
               routeToResumeLessonListener.routeToResumeLesson(
                 profileId,
+                promotedStory.classroomId,
                 promotedStory.topicId,
                 promotedStory.storyId,
                 promotedStory.explorationId,
@@ -117,6 +118,7 @@ class RecentlyPlayedFragmentPresenter @Inject constructor(
             } else if (it is AsyncResult.Failure) {
               explorationCheckpointLiveData.removeObserver(this)
               playExploration(
+                promotedStory.classroomId,
                 promotedStory.topicId,
                 promotedStory.storyId,
                 promotedStory.explorationId,
@@ -128,6 +130,7 @@ class RecentlyPlayedFragmentPresenter @Inject constructor(
       )
     } else {
       playExploration(
+        promotedStory.classroomId,
         promotedStory.topicId,
         promotedStory.storyId,
         promotedStory.explorationId,
@@ -162,6 +165,7 @@ class RecentlyPlayedFragmentPresenter @Inject constructor(
   }
 
   private fun playExploration(
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -174,13 +178,13 @@ class RecentlyPlayedFragmentPresenter @Inject constructor(
       // cases, lessons played from this fragment are known to be in progress, and that progress
       // can't be resumed here (hence the restart).
       explorationDataController.restartExploration(
-        profileId.internalId, topicId, storyId, explorationId
+        profileId.internalId, classroomId, topicId, storyId, explorationId
       )
     } else {
       // The only lessons that can't have their progress saved are those that were already
       // completed.
       explorationDataController.replayExploration(
-        profileId.internalId, topicId, storyId, explorationId
+        profileId.internalId, classroomId, topicId, storyId, explorationId
       )
     }
     startPlayingProvider.toLiveData().observe(fragment) { result ->
@@ -192,6 +196,7 @@ class RecentlyPlayedFragmentPresenter @Inject constructor(
           oppiaLogger.d("RecentlyPlayedFragment", "Successfully loaded exploration")
           routeToExplorationListener.routeToExploration(
             profileId,
+            classroomId,
             topicId,
             storyId,
             explorationId,
diff --git a/app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicItemViewModel.kt b/app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicItemViewModel.kt
index 2f8e6f9e84d..1b074ed6f1b 100644
--- a/app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicItemViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicItemViewModel.kt
@@ -27,7 +27,7 @@ class OngoingTopicItemViewModel(
   }
 
   fun onTopicItemClicked() {
-    routeToTopic(internalProfileId, topic.topicId)
+    routeToTopic(internalProfileId, topic.classroomId, topic.topicId)
   }
 
   fun computeStoryCountText(): String {
@@ -36,10 +36,11 @@ class OngoingTopicItemViewModel(
     )
   }
 
-  override fun routeToTopic(internalProfileId: Int, topicId: String) {
+  override fun routeToTopic(internalProfileId: Int, classroomId: String, topicId: String) {
     val intent = intentFactoryShim.createTopicActivityIntent(
       activity.applicationContext,
       internalProfileId,
+      classroomId,
       topicId
     )
     activity.startActivity(intent)
diff --git a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivity.kt b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivity.kt
index 4e73ac992e3..b95785bf2d0 100755
--- a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivity.kt
@@ -60,6 +60,7 @@ class ExplorationActivity :
     explorationActivityPresenter.handleOnCreate(
       this,
       params.profileId,
+      params.classroomId,
       params.topicId,
       params.storyId,
       params.explorationId,
@@ -79,6 +80,7 @@ class ExplorationActivity :
     fun createExplorationActivityIntent(
       context: Context,
       profileId: ProfileId,
+      classroomId: String,
       topicId: String,
       storyId: String,
       explorationId: String,
@@ -87,6 +89,7 @@ class ExplorationActivity :
     ): Intent {
       val params = ExplorationActivityParams.newBuilder().apply {
         this.profileId = profileId
+        this.classroomId = classroomId
         this.topicId = topicId
         this.storyId = storyId
         this.explorationId = explorationId
diff --git a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt
index 76812ff7522..9d1c50ec2ea 100644
--- a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt
@@ -70,6 +70,7 @@ class ExplorationActivityPresenter @Inject constructor(
   private lateinit var explorationToolbar: Toolbar
   private lateinit var explorationToolbarTitle: TextView
   private lateinit var profileId: ProfileId
+  private lateinit var classroomId: String
   private lateinit var topicId: String
   private lateinit var storyId: String
   private lateinit var explorationId: String
@@ -85,6 +86,7 @@ class ExplorationActivityPresenter @Inject constructor(
   fun handleOnCreate(
     context: Context,
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -125,6 +127,7 @@ class ExplorationActivityPresenter @Inject constructor(
     }
 
     this.profileId = profileId
+    this.classroomId = classroomId
     this.topicId = topicId
     this.storyId = storyId
     this.explorationId = explorationId
@@ -187,6 +190,7 @@ class ExplorationActivityPresenter @Inject constructor(
         R.id.exploration_fragment_placeholder,
         ExplorationFragment.newInstance(
           profileId,
+          classroomId,
           topicId,
           storyId,
           explorationId,
@@ -386,7 +390,12 @@ class ExplorationActivityPresenter @Inject constructor(
       ExplorationActivityParams.ParentScreen.UNRECOGNIZED -> {
         // Default to the topic activity.
         activity.startActivity(
-          TopicActivity.createTopicActivityIntent(context, profileId.internalId, topicId)
+          TopicActivity.createTopicActivityIntent(
+            context,
+            profileId.internalId,
+            classroomId,
+            topicId
+          )
         )
         activity.finish()
       }
diff --git a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragment.kt b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragment.kt
index 8411ab49c46..fdffb73b32d 100755
--- a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragment.kt
+++ b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragment.kt
@@ -22,6 +22,7 @@ class ExplorationFragment : InjectableFragment() {
     /** Returns a new [ExplorationFragment] with the corresponding fragment parameters. */
     fun newInstance(
       profileId: ProfileId,
+      classroomId: String,
       topicId: String,
       storyId: String,
       explorationId: String,
@@ -29,6 +30,7 @@ class ExplorationFragment : InjectableFragment() {
     ): ExplorationFragment {
       val args = ExplorationFragmentArguments.newBuilder().apply {
         this.profileId = profileId
+        this.classroomId = classroomId
         this.topicId = topicId
         this.storyId = storyId
         this.explorationId = explorationId
diff --git a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragmentPresenter.kt
index a64fa466a65..151f2456f53 100755
--- a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragmentPresenter.kt
@@ -58,7 +58,7 @@ class ExplorationFragmentPresenter @Inject constructor(
       StateFragment.newInstance(
         args.profileId.internalId, args.topicId, args.storyId, args.explorationId
       )
-    logPracticeFragmentEvent(args.topicId, args.storyId, args.explorationId)
+    logPracticeFragmentEvent(args.classroomId, args.topicId, args.storyId, args.explorationId)
     if (getStateFragment() == null) {
       fragment.childFragmentManager.beginTransaction().add(
         R.id.state_fragment_placeholder,
@@ -153,9 +153,16 @@ class ExplorationFragmentPresenter @Inject constructor(
       ) as StateFragment?
   }
 
-  private fun logPracticeFragmentEvent(topicId: String, storyId: String, explorationId: String) {
+  private fun logPracticeFragmentEvent(
+    classroomId: String,
+    topicId: String,
+    storyId: String,
+    explorationId: String
+  ) {
     analyticsController.logImportantEvent(
-      oppiaLogger.createOpenExplorationActivityContext(topicId, storyId, explorationId),
+      oppiaLogger.createOpenExplorationActivityContext(
+        classroomId, topicId, storyId, explorationId
+      ),
       ProfileId.newBuilder().apply { internalId = internalProfileId }.build()
     )
   }
diff --git a/app/src/main/java/org/oppia/android/app/player/state/StateFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/player/state/StateFragmentPresenter.kt
index a6726774c96..e939d9afbb4 100755
--- a/app/src/main/java/org/oppia/android/app/player/state/StateFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/player/state/StateFragmentPresenter.kt
@@ -438,9 +438,8 @@ class StateFragmentPresenter @Inject constructor(
     val inputManager: InputMethodManager =
       activity.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
     inputManager.hideSoftInputFromWindow(
-      fragment.view!!.windowToken,
-      @Suppress("DEPRECATION") // TODO(#5406): Use the correct constant value here.
-      InputMethodManager.SHOW_FORCED
+      fragment.requireView().windowToken,
+      0 // Flag value to force hide the keyboard when possible.
     )
   }
 
diff --git a/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivity.kt b/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivity.kt
index e8117516284..2fc44ad11f5 100644
--- a/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivity.kt
@@ -71,6 +71,7 @@ class StateFragmentTestActivity :
     fun createTestActivityIntent(
       context: Context,
       profileId: Int,
+      classroomId: String,
       topicId: String,
       storyId: String,
       explorationId: String,
@@ -78,6 +79,7 @@ class StateFragmentTestActivity :
     ): Intent {
       val args = StateFragmentTestActivityParams.newBuilder().apply {
         this.internalProfileId = profileId
+        this.classroomId = classroomId
         this.topicId = topicId
         this.storyId = storyId
         this.explorationId = explorationId
diff --git a/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivityPresenter.kt
index 3c52bb6e777..6beed9aaf21 100644
--- a/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivityPresenter.kt
@@ -12,6 +12,7 @@ import org.oppia.android.app.player.exploration.TAG_HINTS_AND_SOLUTION_EXPLORATI
 import org.oppia.android.app.player.state.StateFragment
 import org.oppia.android.app.player.state.testing.StateFragmentTestActivity.Companion.STATE_FRAGMENT_TEST_ACTIVITY_PARAMS_KEY
 import org.oppia.android.databinding.StateFragmentTestActivityBinding
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_0
 import org.oppia.android.domain.exploration.ExplorationDataController
 import org.oppia.android.domain.oppialogger.OppiaLogger
 import org.oppia.android.domain.topic.TEST_EXPLORATION_ID_2
@@ -34,6 +35,7 @@ class StateFragmentTestActivityPresenter @Inject constructor(
 ) {
 
   private var profileId: Int = 1
+  private lateinit var classroomId: String
   private lateinit var topicId: String
   private lateinit var storyId: String
   private lateinit var explorationId: String
@@ -54,6 +56,7 @@ class StateFragmentTestActivityPresenter @Inject constructor(
       StateFragmentTestActivityParams.getDefaultInstance()
     )
     profileId = args?.internalProfileId ?: 1
+    classroomId = args?.classroomId ?: TEST_CLASSROOM_ID_0
     topicId =
       args?.topicId ?: TEST_TOPIC_ID_0
     storyId =
@@ -63,7 +66,14 @@ class StateFragmentTestActivityPresenter @Inject constructor(
       ?: TEST_EXPLORATION_ID_2
     shouldSavePartialProgress = args?.shouldSavePartialProgress ?: false
     activity.findViewById<Button>(R.id.play_test_exploration_button)?.setOnClickListener {
-      startPlayingExploration(profileId, topicId, storyId, explorationId, shouldSavePartialProgress)
+      startPlayingExploration(
+        profileId,
+        classroomId,
+        topicId,
+        storyId,
+        explorationId,
+        shouldSavePartialProgress
+      )
     }
   }
 
@@ -85,6 +95,7 @@ class StateFragmentTestActivityPresenter @Inject constructor(
 
   private fun startPlayingExploration(
     profileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -95,10 +106,12 @@ class StateFragmentTestActivityPresenter @Inject constructor(
     explorationDataController.stopPlayingExploration(isCompletion = false)
     val startPlayingProvider = if (shouldSavePartialProgress) {
       explorationDataController.startPlayingNewExploration(
-        profileId, topicId, storyId, explorationId
+        profileId, classroomId, topicId, storyId, explorationId
       )
     } else {
-      explorationDataController.replayExploration(profileId, topicId, storyId, explorationId)
+      explorationDataController.replayExploration(
+        profileId, classroomId, topicId, storyId, explorationId
+      )
     }
     startPlayingProvider.toLiveData().observe(
       activity,
diff --git a/app/src/main/java/org/oppia/android/app/profileprogress/RecentlyPlayedStorySummaryViewModel.kt b/app/src/main/java/org/oppia/android/app/profileprogress/RecentlyPlayedStorySummaryViewModel.kt
index fabe3eb83dc..9980bc52c36 100644
--- a/app/src/main/java/org/oppia/android/app/profileprogress/RecentlyPlayedStorySummaryViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/profileprogress/RecentlyPlayedStorySummaryViewModel.kt
@@ -35,7 +35,9 @@ class RecentlyPlayedStorySummaryViewModel(
   }
 
   fun onStoryItemClicked() {
-    routeToTopicPlayStory(internalProfileId, promotedStory.topicId, promotedStory.storyId)
+    routeToTopicPlayStory(
+      internalProfileId, promotedStory.classroomId, promotedStory.topicId, promotedStory.storyId
+    )
   }
 
   fun computeLessonThumbnailContentDescription(): String {
@@ -44,10 +46,16 @@ class RecentlyPlayedStorySummaryViewModel(
     )
   }
 
-  override fun routeToTopicPlayStory(internalProfileId: Int, topicId: String, storyId: String) {
+  override fun routeToTopicPlayStory(
+    internalProfileId: Int,
+    classroomId: String,
+    topicId: String,
+    storyId: String
+  ) {
     val intent = intentFactoryShim.createTopicPlayStoryActivityIntent(
       activity.applicationContext,
       internalProfileId,
+      classroomId,
       topicId,
       storyId
     )
diff --git a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivity.kt b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivity.kt
index 9ffbd1969e3..77bb464cdfc 100644
--- a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivity.kt
@@ -31,6 +31,7 @@ class ResumeLessonActivity :
     val params = intent.getProtoExtra(PARAMS_KEY, ResumeLessonActivityParams.getDefaultInstance())
     resumeLessonActivityPresenter.handleOnCreate(
       params.profileId,
+      params.classroomId,
       params.topicId,
       params.storyId,
       params.explorationId,
@@ -50,6 +51,7 @@ class ResumeLessonActivity :
     fun createResumeLessonActivityIntent(
       context: Context,
       profileId: ProfileId,
+      classroomId: String,
       topicId: String,
       storyId: String,
       explorationId: String,
@@ -58,6 +60,7 @@ class ResumeLessonActivity :
     ): Intent {
       val params = ResumeLessonActivityParams.newBuilder().apply {
         this.profileId = profileId
+        this.classroomId = classroomId
         this.topicId = topicId
         this.storyId = storyId
         this.explorationId = explorationId
@@ -81,6 +84,7 @@ class ResumeLessonActivity :
 
   override fun routeToExploration(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -91,6 +95,7 @@ class ResumeLessonActivity :
       ExplorationActivity.createExplorationActivityIntent(
         this,
         profileId,
+        classroomId,
         topicId,
         storyId,
         explorationId,
diff --git a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivityPresenter.kt
index e6cbc39c507..63b89fad7d0 100644
--- a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivityPresenter.kt
@@ -19,6 +19,7 @@ class ResumeLessonActivityPresenter @Inject constructor(
   /** Handles onCreate() method of the [ResumeLessonActivity]. */
   fun handleOnCreate(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -40,6 +41,7 @@ class ResumeLessonActivityPresenter @Inject constructor(
     if (getResumeLessonFragment() == null) {
       val resumeLessonFragment = ResumeLessonFragment.newInstance(
         profileId,
+        classroomId,
         topicId,
         storyId,
         explorationId,
diff --git a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonFragment.kt b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonFragment.kt
index 10a05914af6..d0d48da0b7a 100644
--- a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonFragment.kt
+++ b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonFragment.kt
@@ -23,6 +23,7 @@ class ResumeLessonFragment : InjectableFragment() {
     /** Creates new instance of [ResumeLessonFragment] for the provided parameters. */
     fun newInstance(
       profileId: ProfileId,
+      classroomId: String,
       topicId: String,
       storyId: String,
       explorationId: String,
@@ -31,6 +32,7 @@ class ResumeLessonFragment : InjectableFragment() {
     ): ResumeLessonFragment {
       val args = ResumeLessonFragmentArguments.newBuilder().apply {
         this.profileId = profileId
+        this.classroomId = classroomId
         this.topicId = topicId
         this.storyId = storyId
         this.explorationId = explorationId
@@ -65,6 +67,7 @@ class ResumeLessonFragment : InjectableFragment() {
       inflater,
       container,
       args.profileId,
+      args.classroomId,
       args.topicId,
       args.storyId,
       args.explorationId,
diff --git a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonFragmentPresenter.kt
index b3775e5607f..55514a7957a 100644
--- a/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonFragmentPresenter.kt
@@ -42,6 +42,7 @@ class ResumeLessonFragmentPresenter @Inject constructor(
 
   private lateinit var binding: ResumeLessonFragmentBinding
   private lateinit var profileId: ProfileId
+  private lateinit var classroomId: String
   private lateinit var topicId: String
   private lateinit var storyId: String
   private lateinit var explorationId: String
@@ -59,6 +60,7 @@ class ResumeLessonFragmentPresenter @Inject constructor(
     inflater: LayoutInflater,
     container: ViewGroup?,
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -73,6 +75,7 @@ class ResumeLessonFragmentPresenter @Inject constructor(
 
     this.profileId = profileId
     this.topicId = topicId
+    this.classroomId = classroomId
     this.storyId = storyId
     this.explorationId = explorationId
 
@@ -87,6 +90,7 @@ class ResumeLessonFragmentPresenter @Inject constructor(
     binding.resumeLessonContinueButton.setOnClickListener {
       playExploration(
         profileId,
+        classroomId,
         topicId,
         storyId,
         explorationId,
@@ -98,6 +102,7 @@ class ResumeLessonFragmentPresenter @Inject constructor(
     binding.resumeLessonStartOverButton.setOnClickListener {
       playExploration(
         profileId,
+        classroomId,
         topicId,
         storyId,
         explorationId,
@@ -169,6 +174,7 @@ class ResumeLessonFragmentPresenter @Inject constructor(
 
   private fun playExploration(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -177,11 +183,11 @@ class ResumeLessonFragmentPresenter @Inject constructor(
   ) {
     val startPlayingProvider = if (checkpoint == ExplorationCheckpoint.getDefaultInstance()) {
       explorationDataController.restartExploration(
-        profileId.internalId, topicId, storyId, explorationId
+        profileId.internalId, classroomId, topicId, storyId, explorationId
       )
     } else {
       explorationDataController.resumeExploration(
-        profileId.internalId, topicId, storyId, explorationId, checkpoint
+        profileId.internalId, classroomId, topicId, storyId, explorationId, checkpoint
       )
     }
     startPlayingProvider.toLiveData().observe(fragment) { result ->
@@ -193,6 +199,7 @@ class ResumeLessonFragmentPresenter @Inject constructor(
           oppiaLogger.d("ResumeLessonFragment", "Successfully loaded exploration")
           routeToExplorationListener.routeToExploration(
             profileId,
+            classroomId,
             topicId,
             storyId,
             explorationId,
diff --git a/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShim.kt b/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShim.kt
index 6bf989b0039..0a8994ce081 100644
--- a/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShim.kt
+++ b/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShim.kt
@@ -20,6 +20,7 @@ interface IntentFactoryShim {
   fun createTopicPlayStoryActivityIntent(
     context: Context,
     internalProfileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String
   ): Intent
@@ -30,6 +31,7 @@ interface IntentFactoryShim {
   fun createTopicActivityIntent(
     context: Context,
     internalProfileId: Int,
+    classroomId: String,
     topicId: String
   ): Intent
 }
diff --git a/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShimImpl.kt b/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShimImpl.kt
index cf342ba0ee9..d07bd9c5cc6 100644
--- a/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShimImpl.kt
+++ b/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShimImpl.kt
@@ -28,6 +28,7 @@ class IntentFactoryShimImpl @Inject constructor(
   override fun createTopicPlayStoryActivityIntent(
     context: Context,
     internalProfileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String
   ): Intent {
@@ -35,7 +36,9 @@ class IntentFactoryShimImpl @Inject constructor(
       ProfileId.newBuilder().apply {
         internalId = internalProfileId
       }.build(),
-      topicId, storyId
+      classroomId,
+      topicId,
+      storyId
     )
   }
 
@@ -45,12 +48,14 @@ class IntentFactoryShimImpl @Inject constructor(
   override fun createTopicActivityIntent(
     context: Context,
     internalProfileId: Int,
+    classroomId: String,
     topicId: String
   ): Intent {
     return topicActivityIntentFactory.createIntent(
       ProfileId.newBuilder().apply {
         internalId = internalProfileId
       }.build(),
+      classroomId,
       topicId
     )
   }
diff --git a/app/src/main/java/org/oppia/android/app/story/ExplorationSelectionListener.kt b/app/src/main/java/org/oppia/android/app/story/ExplorationSelectionListener.kt
index 8f42436a7c0..65ec93a3aed 100644
--- a/app/src/main/java/org/oppia/android/app/story/ExplorationSelectionListener.kt
+++ b/app/src/main/java/org/oppia/android/app/story/ExplorationSelectionListener.kt
@@ -9,6 +9,7 @@ interface ExplorationSelectionListener {
   /** Called when an exploration has been selected by the user. */
   fun selectExploration(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
diff --git a/app/src/main/java/org/oppia/android/app/story/StoryActivity.kt b/app/src/main/java/org/oppia/android/app/story/StoryActivity.kt
index 372745559ac..43e56fe01c0 100644
--- a/app/src/main/java/org/oppia/android/app/story/StoryActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/story/StoryActivity.kt
@@ -29,6 +29,7 @@ class StoryActivity :
   @Inject
   lateinit var storyActivityPresenter: StoryActivityPresenter
   private var internalProfileId: Int = -1
+  private lateinit var classroomId: String
   private lateinit var topicId: String
   private lateinit var storyId: String
 
@@ -40,17 +41,21 @@ class StoryActivity :
       StoryActivityParams.getDefaultInstance()
     )
     internalProfileId = intent?.extractCurrentUserProfileId()?.internalId ?: -1
+    classroomId = checkNotNull(args.classroomId) {
+      "Expected extra classroom ID to be included for StoryActivity."
+    }
     topicId = checkNotNull(args.topicId) {
       "Expected extra topic ID to be included for StoryActivity."
     }
     storyId = checkNotNull(args.storyId) {
       "Expected extra story ID to be included for StoryActivity."
     }
-    storyActivityPresenter.handleOnCreate(internalProfileId, topicId, storyId)
+    storyActivityPresenter.handleOnCreate(internalProfileId, classroomId, topicId, storyId)
   }
 
   override fun routeToExploration(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -61,6 +66,7 @@ class StoryActivity :
       ExplorationActivity.createExplorationActivityIntent(
         this,
         profileId,
+        classroomId,
         topicId,
         storyId,
         explorationId,
@@ -72,6 +78,7 @@ class StoryActivity :
 
   override fun routeToResumeLesson(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -82,6 +89,7 @@ class StoryActivity :
       ResumeLessonActivity.createResumeLessonActivityIntent(
         this,
         profileId,
+        classroomId,
         topicId,
         storyId,
         explorationId,
@@ -104,11 +112,13 @@ class StoryActivity :
     fun createStoryActivityIntent(
       context: Context,
       internalProfileId: Int,
+      classroomId: String,
       topicId: String,
       storyId: String
     ): Intent {
       val profileId = ProfileId.newBuilder().setInternalId(internalProfileId).build()
       val args = StoryActivityParams.newBuilder().apply {
+        this.classroomId = classroomId
         this.topicId = topicId
         this.storyId = storyId
       }.build()
diff --git a/app/src/main/java/org/oppia/android/app/story/StoryActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/story/StoryActivityPresenter.kt
index dd840745ca9..8830bd29a05 100644
--- a/app/src/main/java/org/oppia/android/app/story/StoryActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/story/StoryActivityPresenter.kt
@@ -8,12 +8,17 @@ import javax.inject.Inject
 /** The presenter for [StoryActivity]. */
 @ActivityScope
 class StoryActivityPresenter @Inject constructor(private val activity: AppCompatActivity) {
-  fun handleOnCreate(internalProfileId: Int, topicId: String, storyId: String) {
+  fun handleOnCreate(
+    internalProfileId: Int,
+    classroomId: String,
+    topicId: String,
+    storyId: String
+  ) {
     activity.setContentView(R.layout.story_activity)
     if (getStoryFragment() == null) {
       activity.supportFragmentManager.beginTransaction().add(
         R.id.story_fragment_placeholder,
-        StoryFragment.newInstance(internalProfileId, topicId, storyId)
+        StoryFragment.newInstance(internalProfileId, classroomId, topicId, storyId)
       ).commitNow()
     }
   }
diff --git a/app/src/main/java/org/oppia/android/app/story/StoryFragment.kt b/app/src/main/java/org/oppia/android/app/story/StoryFragment.kt
index 963a130dace..2821248a6e0 100644
--- a/app/src/main/java/org/oppia/android/app/story/StoryFragment.kt
+++ b/app/src/main/java/org/oppia/android/app/story/StoryFragment.kt
@@ -24,10 +24,16 @@ class StoryFragment : InjectableFragment(), ExplorationSelectionListener, StoryF
     const val STORY_FRAGMENT_ARGUMENTS_KEY = "StoryFragment.arguments"
 
     /** Returns a new [StoryFragment] to display the story corresponding to the specified story ID. */
-    fun newInstance(internalProfileId: Int, topicId: String, storyId: String): StoryFragment {
+    fun newInstance(
+      internalProfileId: Int,
+      classroomId: String,
+      topicId: String,
+      storyId: String
+    ): StoryFragment {
 
       val profileId = ProfileId.newBuilder().setInternalId(internalProfileId).build()
       val args = StoryFragmentArguments.newBuilder().apply {
+        this.classroomId = classroomId
         this.topicId = topicId
         this.storyId = storyId
       }.build()
@@ -54,24 +60,29 @@ class StoryFragment : InjectableFragment(), ExplorationSelectionListener, StoryF
     savedInstanceState: Bundle?
   ): View? {
     val arguments = checkNotNull(arguments) {
-      "Expected arguments to be passed to StoryFragment"
+      "Expected arguments to be passed to StoryFragment."
     }
     val args =
       arguments.getProto(STORY_FRAGMENT_ARGUMENTS_KEY, StoryFragmentArguments.getDefaultInstance())
 
     val internalProfileId = arguments.extractCurrentUserProfileId().internalId
+    val classroomId =
+      checkNotNull(args.classroomId) {
+        "Expected classroomId to be passed to StoryFragment."
+      }
     val topicId =
       checkNotNull(args.topicId) {
-        "Expected topicId to be passed to StoryFragment"
+        "Expected topicId to be passed to StoryFragment."
       }
     val storyId =
       checkNotNull(args.storyId) {
-        "Expected storyId to be passed to StoryFragment"
+        "Expected storyId to be passed to StoryFragment."
       }
     return storyFragmentPresenter.handleCreateView(
       inflater,
       container,
       internalProfileId,
+      classroomId,
       topicId,
       storyId
     )
@@ -79,6 +90,7 @@ class StoryFragment : InjectableFragment(), ExplorationSelectionListener, StoryF
 
   override fun selectExploration(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -89,6 +101,7 @@ class StoryFragment : InjectableFragment(), ExplorationSelectionListener, StoryF
   ) {
     storyFragmentPresenter.handleSelectExploration(
       profileId,
+      classroomId,
       topicId,
       storyId,
       explorationId,
diff --git a/app/src/main/java/org/oppia/android/app/story/StoryFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/story/StoryFragmentPresenter.kt
index 2433999b826..1d9ff2372c8 100644
--- a/app/src/main/java/org/oppia/android/app/story/StoryFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/story/StoryFragmentPresenter.kt
@@ -73,6 +73,7 @@ class StoryFragmentPresenter @Inject constructor(
     inflater: LayoutInflater,
     container: ViewGroup?,
     internalProfileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String
   ): View {
@@ -83,6 +84,7 @@ class StoryFragmentPresenter @Inject constructor(
     )
     profileId = ProfileId.newBuilder().apply { internalId = internalProfileId }.build()
     storyViewModel.setInternalProfileId(internalProfileId)
+    storyViewModel.setClassroomId(classroomId)
     storyViewModel.setTopicId(topicId)
     storyViewModel.setStoryId(storyId)
     logStoryActivityEvent(topicId, storyId)
@@ -115,6 +117,7 @@ class StoryFragmentPresenter @Inject constructor(
 
   fun handleSelectExploration(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -126,6 +129,7 @@ class StoryFragmentPresenter @Inject constructor(
     if (canExplorationBeResumed) {
       routeToResumeLessonListener.routeToResumeLesson(
         profileId,
+        classroomId,
         topicId,
         storyId,
         explorationId,
@@ -135,6 +139,7 @@ class StoryFragmentPresenter @Inject constructor(
     } else {
       playExploration(
         profileId,
+        classroomId,
         topicId,
         storyId,
         explorationId,
@@ -266,6 +271,7 @@ class StoryFragmentPresenter @Inject constructor(
 
   private fun playExploration(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -277,6 +283,7 @@ class StoryFragmentPresenter @Inject constructor(
     val startPlayingProvider = if (canHavePartialProgressSaved) {
       explorationDataController.startPlayingNewExploration(
         profileId.internalId,
+        classroomId,
         topicId,
         storyId,
         explorationId
@@ -284,6 +291,7 @@ class StoryFragmentPresenter @Inject constructor(
     } else {
       explorationDataController.replayExploration(
         profileId.internalId,
+        classroomId,
         topicId,
         storyId,
         explorationId
@@ -298,6 +306,7 @@ class StoryFragmentPresenter @Inject constructor(
           oppiaLogger.d("Story Fragment", "Successfully loaded exploration: $explorationId")
           routeToExplorationListener.routeToExploration(
             profileId,
+            classroomId,
             topicId,
             storyId,
             explorationId,
diff --git a/app/src/main/java/org/oppia/android/app/story/StoryViewModel.kt b/app/src/main/java/org/oppia/android/app/story/StoryViewModel.kt
index 7fee629b2e4..2acb48ce3fb 100644
--- a/app/src/main/java/org/oppia/android/app/story/StoryViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/story/StoryViewModel.kt
@@ -32,6 +32,7 @@ class StoryViewModel @Inject constructor(
   private val translationController: TranslationController
 ) {
   private var internalProfileId: Int = -1
+  private lateinit var classroomId: String
   private lateinit var topicId: String
 
   /** [storyId] needs to be set before any of the live data members can be accessed. */
@@ -62,6 +63,10 @@ class StoryViewModel @Inject constructor(
     this.internalProfileId = internalProfileId
   }
 
+  fun setClassroomId(classroomId: String) {
+    this.classroomId = classroomId
+  }
+
   fun setTopicId(topicId: String) {
     this.topicId = topicId
   }
@@ -121,6 +126,7 @@ class StoryViewModel @Inject constructor(
           explorationSelectionListener,
           explorationCheckpointController,
           internalProfileId,
+          classroomId,
           topicId,
           storyId,
           ephemeralChapterSummary,
diff --git a/app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryChapterSummaryViewModel.kt b/app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryChapterSummaryViewModel.kt
index 746af71c90b..90163342636 100644
--- a/app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryChapterSummaryViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryChapterSummaryViewModel.kt
@@ -24,6 +24,7 @@ class StoryChapterSummaryViewModel(
   private val explorationSelectionListener: ExplorationSelectionListener,
   val explorationCheckpointController: ExplorationCheckpointController,
   val internalProfileId: Int,
+  val classroomId: String,
   val topicId: String,
   val storyId: String,
   private val ephemeralChapterSummary: EphemeralChapterSummary,
@@ -76,6 +77,7 @@ class StoryChapterSummaryViewModel(
               explorationCheckpointLiveData.removeObserver(this)
               explorationSelectionListener.selectExploration(
                 profileId,
+                classroomId,
                 topicId,
                 storyId,
                 explorationId,
@@ -88,6 +90,7 @@ class StoryChapterSummaryViewModel(
               explorationCheckpointLiveData.removeObserver(this)
               explorationSelectionListener.selectExploration(
                 profileId,
+                classroomId,
                 topicId,
                 storyId,
                 explorationId,
@@ -103,6 +106,7 @@ class StoryChapterSummaryViewModel(
     } else {
       explorationSelectionListener.selectExploration(
         profileId,
+        classroomId,
         topicId,
         storyId,
         explorationId,
diff --git a/app/src/main/java/org/oppia/android/app/survey/SurveyFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/survey/SurveyFragmentPresenter.kt
index 062a4d3864e..cbcfb397e0a 100644
--- a/app/src/main/java/org/oppia/android/app/survey/SurveyFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/survey/SurveyFragmentPresenter.kt
@@ -333,9 +333,8 @@ class SurveyFragmentPresenter @Inject constructor(
     val inputManager: InputMethodManager =
       activity.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
     inputManager.hideSoftInputFromWindow(
-      fragment.view!!.windowToken,
-      @Suppress("DEPRECATION") // TODO(#5406): Use the correct constant value here.
-      InputMethodManager.SHOW_FORCED
+      fragment.requireView().windowToken,
+      0 // Flag value to force hide the keyboard when possible.
     )
   }
 
diff --git a/app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivity.kt
index 1a29b4f6507..e16d9e451a6 100644
--- a/app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivity.kt
@@ -33,6 +33,7 @@ class ExplorationTestActivity :
 
   override fun routeToExploration(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -43,6 +44,7 @@ class ExplorationTestActivity :
       ExplorationActivity.createExplorationActivityIntent(
         this,
         profileId,
+        classroomId,
         topicId,
         storyId,
         explorationId,
diff --git a/app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivityPresenter.kt
index f4a4285b28d..196785a2dea 100644
--- a/app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivityPresenter.kt
@@ -12,6 +12,7 @@ import org.oppia.android.app.home.RouteToExplorationListener
 import org.oppia.android.app.model.ExplorationActivityParams
 import org.oppia.android.app.model.ProfileId
 import org.oppia.android.app.utility.SplitScreenManager
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_0
 import org.oppia.android.domain.exploration.ExplorationDataController
 import org.oppia.android.domain.oppialogger.OppiaLogger
 import org.oppia.android.domain.topic.TEST_EXPLORATION_ID_2
@@ -22,6 +23,7 @@ import org.oppia.android.util.data.DataProviders.Companion.toLiveData
 import javax.inject.Inject
 
 private const val INTERNAL_PROFILE_ID = 0
+private const val CLASSROOM_ID = TEST_CLASSROOM_ID_0
 private const val TOPIC_ID = TEST_TOPIC_ID_0
 private const val STORY_ID = TEST_STORY_ID_0
 private const val EXPLORATION_ID = TEST_EXPLORATION_ID_2
@@ -52,6 +54,7 @@ class ExplorationTestActivityPresenter @Inject constructor(
     explorationDataController.stopPlayingExploration(isCompletion = false)
     explorationDataController.replayExploration(
       INTERNAL_PROFILE_ID,
+      CLASSROOM_ID,
       TOPIC_ID,
       STORY_ID,
       EXPLORATION_ID
@@ -67,6 +70,7 @@ class ExplorationTestActivityPresenter @Inject constructor(
             oppiaLogger.d(TAG_EXPLORATION_TEST_ACTIVITY, "Successfully loaded exploration")
             routeToExplorationListener.routeToExploration(
               ProfileId.newBuilder().apply { internalId = INTERNAL_PROFILE_ID }.build(),
+              CLASSROOM_ID,
               TOPIC_ID,
               STORY_ID,
               EXPLORATION_ID,
diff --git a/app/src/main/java/org/oppia/android/app/testing/HomeFragmentTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/HomeFragmentTestActivity.kt
index 691185772cc..20731d36f2f 100644
--- a/app/src/main/java/org/oppia/android/app/testing/HomeFragmentTestActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/testing/HomeFragmentTestActivity.kt
@@ -33,7 +33,12 @@ class HomeFragmentTestActivity :
   }
 
   // Override functions are needed to fulfill listener definitions.
-  override fun routeToTopic(internalProfileId: Int, topicId: String) {}
-  override fun routeToTopicPlayStory(internalProfileId: Int, topicId: String, storyId: String) {}
+  override fun routeToTopic(internalProfileId: Int, classroomId: String, topicId: String) {}
+  override fun routeToTopicPlayStory(
+    internalProfileId: Int,
+    classroomId: String,
+    topicId: String,
+    storyId: String
+  ) {}
   override fun routeToRecentlyPlayed(recentlyPlayedActivityTitle: RecentlyPlayedActivityTitle) {}
 }
diff --git a/app/src/main/java/org/oppia/android/app/testing/NavigationDrawerTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/NavigationDrawerTestActivity.kt
index fc306b60601..6097b74d8b5 100644
--- a/app/src/main/java/org/oppia/android/app/testing/NavigationDrawerTestActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/testing/NavigationDrawerTestActivity.kt
@@ -61,15 +61,23 @@ class NavigationDrawerTestActivity :
     homeActivityPresenter.handleOnRestart()
   }
 
-  override fun routeToTopic(internalProfileId: Int, topicId: String) {
-    startActivity(TopicActivity.createTopicActivityIntent(this, internalProfileId, topicId))
+  override fun routeToTopic(internalProfileId: Int, classroomId: String, topicId: String) {
+    startActivity(
+      TopicActivity.createTopicActivityIntent(this, internalProfileId, classroomId, topicId)
+    )
   }
 
-  override fun routeToTopicPlayStory(internalProfileId: Int, topicId: String, storyId: String) {
+  override fun routeToTopicPlayStory(
+    internalProfileId: Int,
+    classroomId: String,
+    topicId: String,
+    storyId: String
+  ) {
     startActivity(
       TopicActivity.createTopicPlayStoryActivityIntent(
         this,
         internalProfileId,
+        classroomId,
         topicId,
         storyId
       )
diff --git a/app/src/main/java/org/oppia/android/app/testing/TopicTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/TopicTestActivity.kt
index 7110dd21c70..8355cc46beb 100644
--- a/app/src/main/java/org/oppia/android/app/testing/TopicTestActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/testing/TopicTestActivity.kt
@@ -15,6 +15,7 @@ import org.oppia.android.app.topic.TopicActivityPresenter
 import org.oppia.android.app.topic.TopicFragment
 import org.oppia.android.app.topic.questionplayer.QuestionPlayerActivity
 import org.oppia.android.app.topic.revisioncard.RevisionCardActivity
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_0
 import org.oppia.android.domain.topic.TEST_TOPIC_ID_0
 import javax.inject.Inject
 
@@ -34,6 +35,7 @@ class TopicTestActivity :
     (activityComponent as ActivityComponentImpl).inject(this)
     topicActivityPresenter.handleOnCreate(
       internalProfileId = 0,
+      classroomId = TEST_CLASSROOM_ID_0,
       topicId = TEST_TOPIC_ID_0,
       storyId = ""
     )
@@ -47,11 +49,17 @@ class TopicTestActivity :
     )
   }
 
-  override fun routeToStory(internalProfileId: Int, topicId: String, storyId: String) {
+  override fun routeToStory(
+    internalProfileId: Int,
+    classroomId: String,
+    topicId: String,
+    storyId: String
+  ) {
     startActivity(
       StoryActivity.createStoryActivityIntent(
         this,
         internalProfileId,
+        classroomId,
         topicId,
         storyId
       )
@@ -60,6 +68,7 @@ class TopicTestActivity :
 
   override fun routeToExploration(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -70,6 +79,7 @@ class TopicTestActivity :
       ExplorationActivity.createExplorationActivityIntent(
         this,
         profileId,
+        classroomId,
         topicId,
         storyId,
         explorationId,
diff --git a/app/src/main/java/org/oppia/android/app/testing/TopicTestActivityForStory.kt b/app/src/main/java/org/oppia/android/app/testing/TopicTestActivityForStory.kt
index 57d9f538dc6..2c130de8648 100644
--- a/app/src/main/java/org/oppia/android/app/testing/TopicTestActivityForStory.kt
+++ b/app/src/main/java/org/oppia/android/app/testing/TopicTestActivityForStory.kt
@@ -18,6 +18,7 @@ import org.oppia.android.app.topic.TopicActivityPresenter
 import org.oppia.android.app.topic.TopicFragment
 import org.oppia.android.app.topic.questionplayer.QuestionPlayerActivity
 import org.oppia.android.app.topic.revisioncard.RevisionCardActivity
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_0
 import org.oppia.android.domain.topic.TEST_STORY_ID_0
 import org.oppia.android.domain.topic.TEST_TOPIC_ID_0
 import javax.inject.Inject
@@ -39,6 +40,7 @@ class TopicTestActivityForStory :
     (activityComponent as ActivityComponentImpl).inject(this)
     topicActivityPresenter.handleOnCreate(
       internalProfileId = 0,
+      classroomId = TEST_CLASSROOM_ID_0,
       topicId = TEST_TOPIC_ID_0,
       storyId = TEST_STORY_ID_0
     )
@@ -52,11 +54,17 @@ class TopicTestActivityForStory :
     )
   }
 
-  override fun routeToStory(internalProfileId: Int, topicId: String, storyId: String) {
+  override fun routeToStory(
+    internalProfileId: Int,
+    classroomId: String,
+    topicId: String,
+    storyId: String
+  ) {
     startActivity(
       StoryActivity.createStoryActivityIntent(
         this,
         internalProfileId,
+        classroomId,
         topicId,
         storyId
       )
@@ -65,6 +73,7 @@ class TopicTestActivityForStory :
 
   override fun routeToResumeLesson(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -75,6 +84,7 @@ class TopicTestActivityForStory :
       ResumeLessonActivity.createResumeLessonActivityIntent(
         this,
         profileId,
+        classroomId,
         topicId,
         storyId,
         explorationId,
@@ -86,6 +96,7 @@ class TopicTestActivityForStory :
 
   override fun routeToExploration(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -96,6 +107,7 @@ class TopicTestActivityForStory :
       ExplorationActivity.createExplorationActivityIntent(
         this,
         profileId,
+        classroomId,
         topicId,
         storyId,
         explorationId,
diff --git a/app/src/main/java/org/oppia/android/app/topic/RouteToResumeLessonListener.kt b/app/src/main/java/org/oppia/android/app/topic/RouteToResumeLessonListener.kt
index babe6ff0d83..f33511e4591 100644
--- a/app/src/main/java/org/oppia/android/app/topic/RouteToResumeLessonListener.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/RouteToResumeLessonListener.kt
@@ -9,6 +9,7 @@ interface RouteToResumeLessonListener {
   /** Called selects an exploration that can be resumed. */
   fun routeToResumeLesson(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
diff --git a/app/src/main/java/org/oppia/android/app/topic/RouteToStoryListener.kt b/app/src/main/java/org/oppia/android/app/topic/RouteToStoryListener.kt
index 5cee9714126..13a91ce8c48 100755
--- a/app/src/main/java/org/oppia/android/app/topic/RouteToStoryListener.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/RouteToStoryListener.kt
@@ -2,5 +2,5 @@ package org.oppia.android.app.topic
 
 /** Listener for when an [TopicActivity] should route to a [StoryActivity]. */
 interface RouteToStoryListener {
-  fun routeToStory(internalProfileId: Int, topicId: String, storyId: String)
+  fun routeToStory(internalProfileId: Int, classroomId: String, topicId: String, storyId: String)
 }
diff --git a/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt b/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt
index 95595ea4385..eafcf9156ae 100755
--- a/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt
@@ -36,6 +36,7 @@ class TopicActivity :
 
   private var internalProfileId: Int = -1
   private lateinit var topicId: String
+  private lateinit var classroomId: String
   private var storyId: String? = null
 
   @Inject
@@ -49,13 +50,14 @@ class TopicActivity :
       TOPIC_ACTIVITY_PARAMS_KEY,
       TopicActivityParams.getDefaultInstance()
     )
-    topicId = checkNotNull(
-      args?.topicId
-    ) {
+    classroomId = checkNotNull(args?.classroomId) {
+      "Expected classroom ID to be included in intent for TopicActivity."
+    }
+    topicId = checkNotNull(args?.topicId) {
       "Expected topic ID to be included in intent for TopicActivity."
     }
     storyId = args?.storyId
-    topicActivityPresenter.handleOnCreate(internalProfileId, topicId, storyId)
+    topicActivityPresenter.handleOnCreate(internalProfileId, classroomId, topicId, storyId)
   }
 
   override fun routeToQuestionPlayer(skillIdList: ArrayList<String>) {
@@ -68,11 +70,17 @@ class TopicActivity :
     )
   }
 
-  override fun routeToStory(internalProfileId: Int, topicId: String, storyId: String) {
+  override fun routeToStory(
+    internalProfileId: Int,
+    classroomId: String,
+    topicId: String,
+    storyId: String
+  ) {
     startActivity(
       StoryActivity.createStoryActivityIntent(
         this,
         internalProfileId,
+        classroomId,
         topicId,
         storyId
       )
@@ -98,6 +106,7 @@ class TopicActivity :
 
   override fun routeToExploration(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -108,6 +117,7 @@ class TopicActivity :
       ExplorationActivity.createExplorationActivityIntent(
         this,
         profileId,
+        classroomId,
         topicId,
         storyId,
         explorationId,
@@ -119,6 +129,7 @@ class TopicActivity :
 
   override fun routeToResumeLesson(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -129,6 +140,7 @@ class TopicActivity :
       ResumeLessonActivity.createResumeLessonActivityIntent(
         this,
         profileId,
+        classroomId,
         topicId,
         storyId,
         explorationId,
@@ -145,11 +157,22 @@ class TopicActivity :
   class TopicActivityIntentFactoryImpl @Inject constructor(
     private val activity: AppCompatActivity
   ) : ActivityIntentFactories.TopicActivityIntentFactory {
-    override fun createIntent(profileId: ProfileId, topicId: String): Intent =
-      createTopicActivityIntent(activity, profileId.internalId, topicId)
+    override fun createIntent(profileId: ProfileId, classroomId: String, topicId: String): Intent =
+      createTopicActivityIntent(activity, profileId.internalId, classroomId, topicId)
 
-    override fun createIntent(profileId: ProfileId, topicId: String, storyId: String): Intent =
-      createTopicPlayStoryActivityIntent(activity, profileId.internalId, topicId, storyId)
+    override fun createIntent(
+      profileId: ProfileId,
+      classroomId: String,
+      topicId: String,
+      storyId: String
+    ): Intent =
+      createTopicPlayStoryActivityIntent(
+        activity,
+        profileId.internalId,
+        classroomId,
+        topicId,
+        storyId
+      )
   }
 
   companion object {
@@ -160,9 +183,13 @@ class TopicActivity :
     fun createTopicActivityIntent(
       context: Context,
       internalProfileId: Int,
+      classroomId: String,
       topicId: String
     ): Intent {
-      val args = TopicActivityParams.newBuilder().setTopicId(topicId).build()
+      val args = TopicActivityParams.newBuilder().apply {
+        this.topicId = topicId
+        this.classroomId = classroomId
+      }.build()
       val profileId = ProfileId.newBuilder().setInternalId(internalProfileId).build()
       return Intent(context, TopicActivity::class.java).apply {
         putProtoExtra(TOPIC_ACTIVITY_PARAMS_KEY, args)
@@ -175,10 +202,11 @@ class TopicActivity :
     fun createTopicPlayStoryActivityIntent(
       context: Context,
       internalProfileId: Int,
+      classroomId: String,
       topicId: String,
       storyId: String
     ): Intent {
-      return createTopicActivityIntent(context, internalProfileId, topicId).apply {
+      return createTopicActivityIntent(context, internalProfileId, classroomId, topicId).apply {
         val args =
           getProtoExtra(TOPIC_ACTIVITY_PARAMS_KEY, TopicActivityParams.getDefaultInstance())
         val updateArg = args.toBuilder().setStoryId(storyId).build()
diff --git a/app/src/main/java/org/oppia/android/app/topic/TopicActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/TopicActivityPresenter.kt
index e2b2b598136..807e4d9f292 100755
--- a/app/src/main/java/org/oppia/android/app/topic/TopicActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/TopicActivityPresenter.kt
@@ -19,18 +19,26 @@ const val TOPIC_FRAGMENT_ARGUMENTS_KEY = "TopicFragment.arguments"
 /** The presenter for [TopicActivity]. */
 @ActivityScope
 class TopicActivityPresenter @Inject constructor(private val activity: AppCompatActivity) {
+  private lateinit var classroomId: String
   private lateinit var topicId: String
 
   private lateinit var profileId: ProfileId
 
-  fun handleOnCreate(internalProfileId: Int, topicId: String, storyId: String?) {
+  fun handleOnCreate(
+    internalProfileId: Int,
+    classroomId: String,
+    topicId: String,
+    storyId: String?
+  ) {
     this.topicId = topicId
+    this.classroomId = classroomId
     activity.setContentView(R.layout.topic_activity)
     profileId = ProfileId.newBuilder().setInternalId(internalProfileId).build()
     if (getTopicFragment() == null) {
       val topicFragment = TopicFragment()
       val arguments = Bundle().apply {
         val args = TopicFragmentArguments.newBuilder().apply {
+          this.classroomId = classroomId
           this.topicId = topicId
           if (storyId != null) {
             this.storyId = storyId
diff --git a/app/src/main/java/org/oppia/android/app/topic/TopicFragment.kt b/app/src/main/java/org/oppia/android/app/topic/TopicFragment.kt
index f9298ccac7c..83b1190f2db 100644
--- a/app/src/main/java/org/oppia/android/app/topic/TopicFragment.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/TopicFragment.kt
@@ -8,6 +8,7 @@ import android.view.ViewGroup
 import org.oppia.android.app.fragment.FragmentComponentImpl
 import org.oppia.android.app.fragment.InjectableFragment
 import org.oppia.android.app.model.TopicFragmentArguments
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_0
 import org.oppia.android.domain.topic.TEST_TOPIC_ID_0
 import org.oppia.android.util.extensions.getProto
 import org.oppia.android.util.profile.CurrentUserProfileIdIntentDecorator.extractCurrentUserProfileId
@@ -34,6 +35,7 @@ class TopicFragment : InjectableFragment() {
       TopicFragmentArguments.getDefaultInstance()
     )
     val internalProfileId = arguments?.extractCurrentUserProfileId()?.internalId ?: -1
+    val classroomId = args?.classroomId ?: TEST_CLASSROOM_ID_0
     val topicId = args?.topicId ?: TEST_TOPIC_ID_0
     val storyId = args?.storyId ?: ""
 
@@ -41,6 +43,7 @@ class TopicFragment : InjectableFragment() {
       inflater,
       container,
       internalProfileId,
+      classroomId,
       topicId,
       storyId,
       isConfigChanged = savedInstanceState != null
diff --git a/app/src/main/java/org/oppia/android/app/topic/TopicFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/TopicFragmentPresenter.kt
index 76a43e98978..a68bd187120 100644
--- a/app/src/main/java/org/oppia/android/app/topic/TopicFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/TopicFragmentPresenter.kt
@@ -49,6 +49,7 @@ class TopicFragmentPresenter @Inject constructor(
     inflater: LayoutInflater,
     container: ViewGroup?,
     internalProfileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String,
     isConfigChanged: Boolean
@@ -77,7 +78,7 @@ class TopicFragmentPresenter @Inject constructor(
     viewModel.setTopicId(topicId)
     binding.viewModel = viewModel
 
-    setUpViewPager(viewPager, topicId, isConfigChanged)
+    setUpViewPager(viewPager, classroomId, topicId, isConfigChanged)
     return binding.root
   }
 
@@ -124,9 +125,21 @@ class TopicFragmentPresenter @Inject constructor(
     return if (enableExtraTopicTabsUi.value) tab.positionWithFourTabs else tab.positionWithTwoTabs
   }
 
-  private fun setUpViewPager(viewPager2: ViewPager2, topicId: String, isConfigChanged: Boolean) {
+  private fun setUpViewPager(
+    viewPager2: ViewPager2,
+    classroomId: String,
+    topicId: String,
+    isConfigChanged: Boolean
+  ) {
     val adapter =
-      ViewPagerAdapter(fragment, internalProfileId, topicId, storyId, enableExtraTopicTabsUi.value)
+      ViewPagerAdapter(
+        fragment,
+        internalProfileId,
+        classroomId,
+        topicId,
+        storyId,
+        enableExtraTopicTabsUi.value
+      )
     viewPager2.adapter = adapter
     TabLayoutMediator(tabLayout, viewPager2) { tab, position ->
       val topicTab = TopicTab.getTabForPosition(position, enableExtraTopicTabsUi.value)
diff --git a/app/src/main/java/org/oppia/android/app/topic/ViewPagerAdapter.kt b/app/src/main/java/org/oppia/android/app/topic/ViewPagerAdapter.kt
index 3b1390c6852..60badbd0dd6 100644
--- a/app/src/main/java/org/oppia/android/app/topic/ViewPagerAdapter.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/ViewPagerAdapter.kt
@@ -11,6 +11,7 @@ import org.oppia.android.app.topic.revision.TopicRevisionFragment
 class ViewPagerAdapter(
   fragment: Fragment,
   private val internalProfileId: Int,
+  private val classroomId: String,
   private val topicId: String,
   private val storyId: String,
   private val enableExtraTopicTabsUi: Boolean
@@ -24,7 +25,7 @@ class ViewPagerAdapter(
         TopicInfoFragment.newInstance(internalProfileId, topicId)
       }
       TopicTab.LESSONS -> {
-        TopicLessonsFragment.newInstance(internalProfileId, topicId, storyId)
+        TopicLessonsFragment.newInstance(internalProfileId, classroomId, topicId, storyId)
       }
       TopicTab.PRACTICE -> {
         TopicPracticeFragment.newInstance(internalProfileId, topicId)
diff --git a/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragment.kt b/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragment.kt
index 51db6ebf02c..8c3258e7344 100644
--- a/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragment.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragment.kt
@@ -39,12 +39,14 @@ class TopicLessonsFragment :
     /** Returns a new [TopicLessonsFragment]. */
     fun newInstance(
       internalProfileId: Int,
+      classroomId: String,
       topicId: String,
       storyId: String
     ): TopicLessonsFragment {
 
       val profileId = ProfileId.newBuilder().setInternalId(internalProfileId).build()
       val args = TopicLessonsFragmentArguments.newBuilder().apply {
+        this.classroomId = classroomId
         this.topicId = topicId
         if (storyId.isNotBlank())
           this.storyId = storyId
@@ -91,6 +93,9 @@ class TopicLessonsFragment :
       TOPIC_LESSONS_FRAGMENT_ARGUMENTS_KEY,
       TopicLessonsFragmentArguments.getDefaultInstance()
     )
+    val classroomId = checkNotNull(args?.classroomId) {
+      "Expected classroom ID to be included in arguments for TopicLessonsFragment."
+    }
     val topicId = checkNotNull(args?.topicId) {
       "Expected topic ID to be included in arguments for TopicLessonsFragment."
     }
@@ -101,6 +106,7 @@ class TopicLessonsFragment :
       currentExpandedChapterListIndex,
       this as ExpandedChapterListIndexListener,
       internalProfileId,
+      classroomId,
       topicId,
       storyId,
       isDefaultStoryExpanded
diff --git a/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentPresenter.kt
index bdb858ff1bd..66a5a32b2df 100644
--- a/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentPresenter.kt
@@ -54,6 +54,7 @@ class TopicLessonsFragmentPresenter @Inject constructor(
 
   private lateinit var binding: TopicLessonsFragmentBinding
   private var internalProfileId: Int = -1
+  private lateinit var classroomId: String
   private lateinit var topicId: String
   private lateinit var storyId: String
   private var isDefaultStoryExpanded: Boolean = false
@@ -68,11 +69,13 @@ class TopicLessonsFragmentPresenter @Inject constructor(
     currentExpandedChapterListIndex: Int?,
     expandedChapterListIndexListener: ExpandedChapterListIndexListener,
     internalProfileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String,
     isDefaultStoryExpanded: Boolean
   ): View? {
     this.internalProfileId = internalProfileId
+    this.classroomId = classroomId
     this.topicId = topicId
     this.storyId = storyId
     this.isDefaultStoryExpanded = isDefaultStoryExpanded
@@ -274,7 +277,7 @@ class TopicLessonsFragmentPresenter @Inject constructor(
   }
 
   fun storySummaryClicked(storySummary: StorySummary) {
-    routeToStoryListener.routeToStory(internalProfileId, topicId, storySummary.storyId)
+    routeToStoryListener.routeToStory(internalProfileId, classroomId, topicId, storySummary.storyId)
   }
 
   fun selectChapterSummary(
@@ -308,6 +311,7 @@ class TopicLessonsFragmentPresenter @Inject constructor(
                 explorationCheckpointLiveData.removeObserver(this)
                 routeToResumeLessonListener.routeToResumeLesson(
                   profileId,
+                  classroomId,
                   topicId,
                   storyId,
                   explorationId,
@@ -318,6 +322,7 @@ class TopicLessonsFragmentPresenter @Inject constructor(
                 explorationCheckpointLiveData.removeObserver(this)
                 playExploration(
                   profileId,
+                  classroomId,
                   topicId,
                   storyId,
                   explorationId,
@@ -332,6 +337,7 @@ class TopicLessonsFragmentPresenter @Inject constructor(
       ChapterPlayState.IN_PROGRESS_NOT_SAVED -> {
         playExploration(
           profileId,
+          classroomId,
           topicId,
           storyId,
           explorationId,
@@ -342,6 +348,7 @@ class TopicLessonsFragmentPresenter @Inject constructor(
       else -> {
         playExploration(
           profileId,
+          classroomId,
           topicId,
           storyId,
           explorationId,
@@ -354,6 +361,7 @@ class TopicLessonsFragmentPresenter @Inject constructor(
 
   private fun playExploration(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -364,21 +372,21 @@ class TopicLessonsFragmentPresenter @Inject constructor(
       !canHavePartialProgressSaved -> {
         // Only explorations that have been completed can't be saved, so replay the lesson.
         explorationDataController.replayExploration(
-          internalProfileId, topicId, storyId, explorationId
+          internalProfileId, classroomId, topicId, storyId, explorationId
         )
       }
       hadProgress -> {
         // If there was progress, either the checkpoint was never saved, failed to save, or failed
         // to be retrieved. In all cases, this is a restart.
         explorationDataController.restartExploration(
-          internalProfileId, topicId, storyId, explorationId
+          internalProfileId, classroomId, topicId, storyId, explorationId
         )
       }
       else -> {
         // If there's no progress and it was never completed, then it's a new play through (or the
         // user is very low on device memory).
         explorationDataController.startPlayingNewExploration(
-          internalProfileId, topicId, storyId, explorationId
+          internalProfileId, classroomId, topicId, storyId, explorationId
         )
       }
     }
@@ -391,6 +399,7 @@ class TopicLessonsFragmentPresenter @Inject constructor(
           oppiaLogger.d("TopicLessonsFragment", "Successfully loaded exploration")
           routeToExplorationListener.routeToExploration(
             profileId,
+            classroomId,
             topicId,
             storyId,
             explorationId,
diff --git a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerFragmentPresenter.kt
index 78a978ba51c..e78221853c5 100644
--- a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerFragmentPresenter.kt
@@ -314,9 +314,8 @@ class QuestionPlayerFragmentPresenter @Inject constructor(
     val inputManager: InputMethodManager =
       activity.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
     inputManager.hideSoftInputFromWindow(
-      fragment.view!!.windowToken,
-      @Suppress("DEPRECATION") // TODO(#5406): Use the correct constant value here.
-      InputMethodManager.SHOW_FORCED
+      fragment.requireView().windowToken,
+      0 // Flag value to force hide the keyboard when possible.
     )
   }
 
diff --git a/app/src/sharedTest/java/org/oppia/android/app/classroom/ClassroomListFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/classroom/ClassroomListFragmentTest.kt
index 1ab63f9fe59..28ff88672e8 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/classroom/ClassroomListFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/classroom/ClassroomListFragmentTest.kt
@@ -71,6 +71,8 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_0
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_1
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.ExplorationStorageModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigModule
@@ -626,6 +628,7 @@ class ClassroomListFragmentTest {
     testCoroutineDispatchers.runCurrent()
 
     val args = TopicActivityParams.newBuilder().apply {
+      this.classroomId = TEST_CLASSROOM_ID_1
       this.topicId = FRACTIONS_TOPIC_ID
       this.storyId = FRACTIONS_STORY_ID_0
     }.build()
@@ -647,6 +650,7 @@ class ClassroomListFragmentTest {
     testCoroutineDispatchers.runCurrent()
 
     val args = TopicActivityParams.newBuilder().apply {
+      this.classroomId = TEST_CLASSROOM_ID_0
       this.topicId = TEST_TOPIC_ID_0
       this.storyId = TEST_STORY_ID_0
     }.build()
diff --git a/app/src/sharedTest/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivityTest.kt
index 7a4686d0b01..2d7afaf5f53 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivityTest.kt
@@ -66,6 +66,7 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_1
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.ExplorationStorageModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigModule
@@ -271,6 +272,7 @@ class CompletedStoryListActivityTest {
       ).perform(click())
 
       val args = TopicActivityParams.newBuilder().apply {
+        this.classroomId = TEST_CLASSROOM_ID_1
         this.topicId = FRACTIONS_TOPIC_ID
         this.storyId = FRACTIONS_STORY_ID_0
       }.build()
@@ -302,6 +304,7 @@ class CompletedStoryListActivityTest {
       ).perform(click())
 
       val args = TopicActivityParams.newBuilder().apply {
+        this.classroomId = TEST_CLASSROOM_ID_1
         this.topicId = FRACTIONS_TOPIC_ID
         this.storyId = FRACTIONS_STORY_ID_0
       }.build()
diff --git a/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt
index c32d70aa018..b6962460974 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt
@@ -100,6 +100,8 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_0
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_1
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.ExplorationStorageModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigModule
@@ -957,6 +959,7 @@ class HomeActivityTest {
       ).perform(click())
 
       val args = TopicActivityParams.newBuilder().apply {
+        this.classroomId = TEST_CLASSROOM_ID_1
         this.topicId = FRACTIONS_TOPIC_ID
         this.storyId = FRACTIONS_STORY_ID_0
       }.build()
@@ -1037,6 +1040,7 @@ class HomeActivityTest {
       ).check(matches(withText(containsString("Fractions")))).perform(click())
 
       val args = TopicActivityParams.newBuilder().apply {
+        this.classroomId = TEST_CLASSROOM_ID_1
         this.topicId = FRACTIONS_TOPIC_ID
         this.storyId = FRACTIONS_STORY_ID_0
       }.build()
@@ -1205,6 +1209,7 @@ class HomeActivityTest {
       onView(atPosition(R.id.home_recycler_view, 3)).perform(click())
 
       val args = TopicActivityParams.newBuilder().apply {
+        this.classroomId = TEST_CLASSROOM_ID_0
         this.topicId = TEST_TOPIC_ID_0
         this.storyId = TEST_STORY_ID_0
       }.build()
diff --git a/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt
index 1120d96bd29..c45a0580213 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt
@@ -84,6 +84,7 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_1
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.testing.ExplorationStorageTestModule
 import org.oppia.android.domain.exploration.testing.FakeExplorationRetriever
@@ -842,6 +843,7 @@ class RecentlyPlayedFragmentTest {
         explorationId = FRACTIONS_EXPLORATION_ID_0
         storyId = FRACTIONS_STORY_ID_0
         topicId = FRACTIONS_TOPIC_ID
+        classroomId = TEST_CLASSROOM_ID_1
         profileId = ProfileId.newBuilder().apply { internalId = internalProfileId }.build()
         parentScreen = ExplorationActivityParams.ParentScreen.PARENT_SCREEN_UNSPECIFIED
         checkpoint = ExplorationCheckpoint.newBuilder().apply {
@@ -899,6 +901,7 @@ class RecentlyPlayedFragmentTest {
         explorationId = FRACTIONS_EXPLORATION_ID_0
         storyId = FRACTIONS_STORY_ID_0
         topicId = FRACTIONS_TOPIC_ID
+        classroomId = TEST_CLASSROOM_ID_1
         profileId = ProfileId.newBuilder().apply { internalId = internalProfileId }.build()
         isCheckpointingEnabled = true
         parentScreen = ExplorationActivityParams.ParentScreen.PARENT_SCREEN_UNSPECIFIED
@@ -938,6 +941,7 @@ class RecentlyPlayedFragmentTest {
         explorationId = FRACTIONS_EXPLORATION_ID_0
         storyId = FRACTIONS_STORY_ID_0
         topicId = FRACTIONS_TOPIC_ID
+        classroomId = TEST_CLASSROOM_ID_1
         profileId = ProfileId.newBuilder().apply { internalId = internalProfileId }.build()
         isCheckpointingEnabled = true
         parentScreen = ExplorationActivityParams.ParentScreen.PARENT_SCREEN_UNSPECIFIED
@@ -982,6 +986,7 @@ class RecentlyPlayedFragmentTest {
         explorationId = FRACTIONS_EXPLORATION_ID_0
         storyId = FRACTIONS_STORY_ID_0
         topicId = FRACTIONS_TOPIC_ID
+        classroomId = TEST_CLASSROOM_ID_1
         profileId = ProfileId.newBuilder().apply { internalId = internalProfileId }.build()
         isCheckpointingEnabled = true
         parentScreen = ExplorationActivityParams.ParentScreen.PARENT_SCREEN_UNSPECIFIED
diff --git a/app/src/sharedTest/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListActivityTest.kt
index 0e1bdd16da1..7c6f16174d0 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListActivityTest.kt
@@ -65,6 +65,7 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_1
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.ExplorationStorageModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigModule
@@ -246,7 +247,10 @@ class OngoingTopicListActivityTest {
         )
       ).perform(click())
 
-      val args = TopicActivityParams.newBuilder().setTopicId(RATIOS_TOPIC_ID).build()
+      val args = TopicActivityParams.newBuilder().apply {
+        classroomId = TEST_CLASSROOM_ID_1
+        topicId = RATIOS_TOPIC_ID
+      }.build()
       val profileId = ProfileId.newBuilder().setInternalId(internalProfileId).build()
       intended(hasComponent(TopicActivity::class.java.name))
       intended(hasProtoExtra(TopicActivity.TOPIC_ACTIVITY_PARAMS_KEY, args))
@@ -276,7 +280,10 @@ class OngoingTopicListActivityTest {
         )
       ).perform(click())
 
-      val args = TopicActivityParams.newBuilder().setTopicId(RATIOS_TOPIC_ID).build()
+      val args = TopicActivityParams.newBuilder().apply {
+        classroomId = TEST_CLASSROOM_ID_1
+        topicId = RATIOS_TOPIC_ID
+      }.build()
       val profileId = ProfileId.newBuilder().setInternalId(internalProfileId).build()
       intended(hasComponent(TopicActivity::class.java.name))
       intended(hasProtoExtra(TopicActivity.TOPIC_ACTIVITY_PARAMS_KEY, args))
diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
index df5dfbf4c28..ec53953d954 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
@@ -81,7 +81,6 @@ import org.oppia.android.app.player.state.itemviewmodel.SplitScreenInteractionMo
 import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel
 import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView
 import org.oppia.android.app.shim.ViewBindingShimModule
-import org.oppia.android.app.testing.ExplorationInjectionActivity
 import org.oppia.android.app.translation.testing.ActivityRecreatorTestModule
 import org.oppia.android.app.utility.EspressoTestsMatchers.hasProtoExtra
 import org.oppia.android.app.utility.EspressoTestsMatchers.withDrawable
@@ -102,6 +101,8 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_0
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_1
 import org.oppia.android.domain.exploration.ExplorationDataController
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.testing.ExplorationStorageTestModule
@@ -249,25 +250,6 @@ class ExplorationActivityTest {
     ApplicationProvider.getApplicationContext<TestApplication>().inject(this)
   }
 
-  private fun getApplicationDependencies(
-    internalProfileId: Int,
-    topicId: String,
-    storyId: String,
-    explorationId: String
-  ) {
-    launch(ExplorationInjectionActivity::class.java).use {
-      it.onActivity { activity ->
-        explorationDataController = activity.explorationDataController
-        explorationDataController.startPlayingNewExploration(
-          internalProfileId,
-          topicId,
-          storyId,
-          explorationId
-        )
-      }
-    }
-  }
-
   // TODO(#388): Fill in remaining tests for this activity.
   @get:Rule
   var explorationActivityTestRule: ActivityTestRule<ExplorationActivity> = ActivityTestRule(
@@ -280,6 +262,7 @@ class ExplorationActivityTest {
   fun testActivity_createIntent_verifyScreenNameInIntent() {
     val screenName = createExplorationActivityIntent(
       internalProfileId,
+      TEST_CLASSROOM_ID_0,
       TEST_TOPIC_ID_0,
       TEST_STORY_ID_0,
       TEST_EXPLORATION_ID_2,
@@ -295,6 +278,7 @@ class ExplorationActivityTest {
     explorationActivityTestRule.launchActivity(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -313,6 +297,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -321,6 +306,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -339,6 +325,7 @@ class ExplorationActivityTest {
     explorationActivityTestRule.launchActivity(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -362,6 +349,7 @@ class ExplorationActivityTest {
     explorationActivityTestRule.launchActivity(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -385,6 +373,7 @@ class ExplorationActivityTest {
     explorationActivityTestRule.launchActivity(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -408,6 +397,7 @@ class ExplorationActivityTest {
     explorationActivityTestRule.launchActivity(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -429,6 +419,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -437,6 +428,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -455,6 +447,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -463,6 +456,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -483,6 +477,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -491,6 +486,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -512,6 +508,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -520,6 +517,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -534,6 +532,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -542,6 +541,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -560,6 +560,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -568,6 +569,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -586,6 +588,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -594,6 +597,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -605,6 +609,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -613,6 +618,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -632,6 +638,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -640,6 +647,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -659,6 +667,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -667,6 +676,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -678,6 +688,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -686,6 +697,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -704,6 +716,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -712,6 +725,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -730,6 +744,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -738,6 +753,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -757,6 +773,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -765,6 +782,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -784,6 +802,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -792,6 +811,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -806,6 +826,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -814,6 +835,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -831,6 +853,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0,
@@ -839,6 +862,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0
@@ -860,6 +884,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0,
@@ -868,6 +893,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0
@@ -889,6 +915,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0,
@@ -897,6 +924,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0
@@ -919,6 +947,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0,
@@ -927,6 +956,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0
@@ -958,6 +988,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0,
@@ -966,6 +997,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0
@@ -1004,6 +1036,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0,
@@ -1012,6 +1045,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0
@@ -1047,6 +1081,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0,
@@ -1055,6 +1090,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0
@@ -1091,6 +1127,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0,
@@ -1099,6 +1136,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0
@@ -1130,6 +1168,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1138,6 +1177,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -1192,6 +1232,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0,
@@ -1200,6 +1241,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0
@@ -1236,6 +1278,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1252,6 +1295,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1260,6 +1304,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -1281,6 +1326,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1289,6 +1335,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -1310,6 +1357,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0,
@@ -1318,6 +1366,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0,
         RATIOS_EXPLORATION_ID_0
@@ -1348,6 +1397,7 @@ class ExplorationActivityTest {
     explorationActivityTestRule.launchActivity(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1356,6 +1406,7 @@ class ExplorationActivityTest {
     )
     explorationDataController.startPlayingNewExploration(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0,
       FRACTIONS_EXPLORATION_ID_0
@@ -1376,6 +1427,7 @@ class ExplorationActivityTest {
     explorationActivityTestRule.launchActivity(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1384,6 +1436,7 @@ class ExplorationActivityTest {
     )
     explorationDataController.startPlayingNewExploration(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0,
       FRACTIONS_EXPLORATION_ID_0
@@ -1407,6 +1460,7 @@ class ExplorationActivityTest {
     explorationActivityTestRule.launchActivity(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1415,6 +1469,7 @@ class ExplorationActivityTest {
     )
     explorationDataController.startPlayingNewExploration(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0,
       FRACTIONS_EXPLORATION_ID_0
@@ -1447,6 +1502,7 @@ class ExplorationActivityTest {
     explorationActivityTestRule.launchActivity(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1455,6 +1511,7 @@ class ExplorationActivityTest {
     )
     explorationDataController.startPlayingNewExploration(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0,
       FRACTIONS_EXPLORATION_ID_0
@@ -1479,6 +1536,7 @@ class ExplorationActivityTest {
     explorationActivityTestRule.launchActivity(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1487,6 +1545,7 @@ class ExplorationActivityTest {
     )
     explorationDataController.startPlayingNewExploration(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0,
       FRACTIONS_EXPLORATION_ID_0
@@ -1505,6 +1564,7 @@ class ExplorationActivityTest {
     explorationActivityTestRule.launchActivity(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1513,6 +1573,7 @@ class ExplorationActivityTest {
     )
     explorationDataController.startPlayingNewExploration(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0,
       FRACTIONS_EXPLORATION_ID_0
@@ -1538,6 +1599,7 @@ class ExplorationActivityTest {
     explorationActivityTestRule.launchActivity(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1546,6 +1608,7 @@ class ExplorationActivityTest {
     )
     explorationDataController.startPlayingNewExploration(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0,
       FRACTIONS_EXPLORATION_ID_0
@@ -1578,6 +1641,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1586,6 +1650,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -1614,6 +1679,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1622,6 +1688,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -1651,6 +1718,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1659,6 +1727,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -1690,6 +1759,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1698,6 +1768,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -1730,6 +1801,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1738,6 +1810,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -1769,6 +1842,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1777,6 +1851,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -1820,6 +1895,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1828,6 +1904,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -1871,6 +1948,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1879,6 +1957,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0
@@ -1912,6 +1991,7 @@ class ExplorationActivityTest {
     explorationActivityTestRule.launchActivity(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1920,6 +2000,7 @@ class ExplorationActivityTest {
     )
     explorationDataController.startPlayingNewExploration(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0,
       FRACTIONS_EXPLORATION_ID_0
@@ -1944,6 +2025,7 @@ class ExplorationActivityTest {
     explorationActivityTestRule.launchActivity(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1952,6 +2034,7 @@ class ExplorationActivityTest {
     )
     explorationDataController.startPlayingNewExploration(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0,
       FRACTIONS_EXPLORATION_ID_0
@@ -1974,6 +2057,7 @@ class ExplorationActivityTest {
     explorationActivityTestRule.launchActivity(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -1982,6 +2066,7 @@ class ExplorationActivityTest {
     )
     explorationDataController.startPlayingNewExploration(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0,
       FRACTIONS_EXPLORATION_ID_0
@@ -2007,6 +2092,7 @@ class ExplorationActivityTest {
     explorationActivityTestRule.launchActivity(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -2015,6 +2101,7 @@ class ExplorationActivityTest {
     )
     explorationDataController.replayExploration(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0,
       FRACTIONS_EXPLORATION_ID_0
@@ -2037,6 +2124,7 @@ class ExplorationActivityTest {
     explorationActivityTestRule.launchActivity(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0,
         FRACTIONS_EXPLORATION_ID_0,
@@ -2045,6 +2133,7 @@ class ExplorationActivityTest {
     )
     explorationDataController.replayExploration(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0,
       FRACTIONS_EXPLORATION_ID_0
@@ -2071,6 +2160,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -2079,6 +2169,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -2101,6 +2192,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -2109,6 +2201,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -2131,6 +2224,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -2139,6 +2233,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -2167,6 +2262,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -2175,6 +2271,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -2212,6 +2309,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -2220,6 +2318,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -2248,6 +2347,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -2256,6 +2356,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -2289,6 +2390,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -2297,6 +2399,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -2325,6 +2428,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -2333,6 +2437,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -2351,6 +2456,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -2359,6 +2465,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -2388,6 +2495,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -2396,6 +2504,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -2425,6 +2534,7 @@ class ExplorationActivityTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2,
@@ -2433,6 +2543,7 @@ class ExplorationActivityTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -2468,6 +2579,7 @@ class ExplorationActivityTest {
 
   private fun createExplorationActivityIntent(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -2478,6 +2590,7 @@ class ExplorationActivityTest {
     return ExplorationActivity.createExplorationActivityIntent(
       ApplicationProvider.getApplicationContext(),
       ProfileId.newBuilder().apply { internalId = internalProfileId }.build(),
+      classroomId,
       topicId,
       storyId,
       explorationId,
diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt
index 50c77762c0c..d7a9ae13b1e 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt
@@ -124,6 +124,7 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_0
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.ExplorationStorageModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigFastShowTestModule
@@ -4603,6 +4604,7 @@ class StateFragmentTest {
       StateFragmentTestActivity.createTestActivityIntent(
         context,
         profileId.internalId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         explorationId,
diff --git a/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt
index 2528d34e73a..a9015c415da 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt
@@ -88,6 +88,7 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_1
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.ExplorationStorageModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigModule
@@ -659,6 +660,7 @@ class ProfileProgressFragmentTest {
       clickProfileProgressItem(itemPosition = 1, targetViewId = R.id.topic_name_text_view)
 
       val args = TopicActivityParams.newBuilder().apply {
+        this.classroomId = TEST_CLASSROOM_ID_1
         this.topicId = FRACTIONS_TOPIC_ID
         this.storyId = FRACTIONS_STORY_ID_0
       }.build()
diff --git a/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonActivityTest.kt
index 3186c6a8188..40aeae59dcc 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonActivityTest.kt
@@ -62,6 +62,7 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_1
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.ExplorationStorageModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigModule
@@ -204,6 +205,7 @@ class ResumeLessonActivityTest {
     return ResumeLessonActivity.createResumeLessonActivityIntent(
       context,
       ProfileId.newBuilder().apply { internalId = 1 }.build(),
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0,
       FRACTIONS_EXPLORATION_ID_0,
diff --git a/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonFragmentTest.kt
index 015955e6dde..d30099e4ee0 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/resumelesson/ResumeLessonFragmentTest.kt
@@ -61,6 +61,7 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_1
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.ExplorationStorageModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigModule
@@ -272,6 +273,7 @@ class ResumeLessonFragmentTest {
     return ResumeLessonActivity.createResumeLessonActivityIntent(
       context,
       ProfileId.newBuilder().apply { internalId = 1 }.build(),
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0,
       FRACTIONS_EXPLORATION_ID_0,
@@ -284,6 +286,7 @@ class ResumeLessonFragmentTest {
     return ResumeLessonActivity.createResumeLessonActivityIntent(
       context,
       ProfileId.newBuilder().apply { internalId = 1 }.build(),
+      TEST_CLASSROOM_ID_1,
       RATIOS_TOPIC_ID,
       RATIOS_STORY_ID_0,
       RATIOS_EXPLORATION_ID_0,
diff --git a/app/src/sharedTest/java/org/oppia/android/app/story/StoryActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/story/StoryActivityTest.kt
index 3b5364c992f..733b0efc911 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/story/StoryActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/story/StoryActivityTest.kt
@@ -61,6 +61,7 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_0
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.ExplorationStorageModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigModule
@@ -151,6 +152,7 @@ class StoryActivityTest {
   fun testActivity_createIntent_verifyScreenNameInIntent() {
     val currentScreenName = createStoryActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID_0,
       topicId = TEST_TOPIC_ID_0,
       storyId = TEST_STORY_ID_0
     ).extractCurrentAppScreenName()
@@ -163,6 +165,7 @@ class StoryActivityTest {
     activityTestRule.launchActivity(
       createStoryActivityIntent(
         internalProfileId = internalProfileId,
+        classroomId = TEST_CLASSROOM_ID_0,
         topicId = TEST_TOPIC_ID_0,
         storyId = TEST_STORY_ID_0
       )
@@ -180,6 +183,7 @@ class StoryActivityTest {
     launch<StoryActivity>(
       createStoryActivityIntent(
         internalProfileId = internalProfileId,
+        classroomId = TEST_CLASSROOM_ID_0,
         topicId = TEST_TOPIC_ID_0,
         storyId = TEST_STORY_ID_0
       )
@@ -203,6 +207,7 @@ class StoryActivityTest {
         explorationId = TEST_EXPLORATION_ID_2
         storyId = TEST_STORY_ID_0
         topicId = TEST_TOPIC_ID_0
+        classroomId = TEST_CLASSROOM_ID_0
         profileId = ProfileId.newBuilder().apply { internalId = internalProfileId }.build()
         parentScreen = ExplorationActivityParams.ParentScreen.STORY_SCREEN
         isCheckpointingEnabled = true
@@ -222,12 +227,14 @@ class StoryActivityTest {
 
   private fun createStoryActivityIntent(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String
   ): Intent {
     return StoryActivity.createStoryActivityIntent(
       context = ApplicationProvider.getApplicationContext(),
       internalProfileId = internalProfileId,
+      classroomId = classroomId,
       topicId = topicId,
       storyId = storyId
     )
diff --git a/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt
index 567bbf9c3ba..c93e0f8460a 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt
@@ -92,6 +92,7 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_1
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.ExplorationStorageModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigModule
@@ -934,6 +935,7 @@ class StoryFragmentTest {
     return StoryActivity.createStoryActivityIntent(
       ApplicationProvider.getApplicationContext(),
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0
     )
@@ -943,6 +945,7 @@ class StoryFragmentTest {
     return StoryActivity.createStoryActivityIntent(
       ApplicationProvider.getApplicationContext(),
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       TEST_TOPIC_ID_0,
       TEST_STORY_ID_0
     )
@@ -952,6 +955,7 @@ class StoryFragmentTest {
     return StoryActivity.createStoryActivityIntent(
       ApplicationProvider.getApplicationContext(),
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       RATIOS_TOPIC_ID,
       RATIOS_STORY_ID_0
     )
diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/TopicActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/TopicActivityTest.kt
index 289deeb0f4e..debec65d207 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/topic/TopicActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/topic/TopicActivityTest.kt
@@ -62,6 +62,7 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_1
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.ExplorationStorageModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigModule
@@ -155,11 +156,11 @@ class TopicActivityTest {
   @Test
   fun testActivity_createIntent_verifyScreenNameInIntent() {
     val currentScreenNameWithIntentOne = TopicActivity.createTopicActivityIntent(
-      context, 1, FRACTIONS_TOPIC_ID
+      context, 1, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID
     ).extractCurrentAppScreenName()
 
     val currentScreenNameWithIntentTwo = TopicActivity.createTopicPlayStoryActivityIntent(
-      context, 1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0
+      context, 1, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0
     ).extractCurrentAppScreenName()
 
     assertThat(currentScreenNameWithIntentOne).isEqualTo(ScreenName.TOPIC_ACTIVITY)
@@ -169,7 +170,9 @@ class TopicActivityTest {
   @Test
   fun testTopicActivity_hasCorrectActivityLabel() {
     TestPlatformParameterModule.forceEnableExtraTopicTabsUi(true)
-    launchTopicActivity(internalProfileId, FRACTIONS_TOPIC_ID).use { scenario ->
+    launchTopicActivity(
+      internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID
+    ).use { scenario ->
       lateinit var title: CharSequence
       scenario.onActivity { activity -> title = activity.title }
 
@@ -183,7 +186,7 @@ class TopicActivityTest {
   @RunOn(TestPlatform.ROBOLECTRIC) // TODO(#3858): Enable for Espresso.
   fun testTopicActivity_startPracticeSession_questionActivityStartedWithProfileId() {
     TestPlatformParameterModule.forceEnableExtraTopicTabsUi(true)
-    launchTopicActivity(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivity(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       // Open the practice tab and select a skill.
       onView(withText("Practice")).perform(click())
       testCoroutineDispatchers.runCurrent()
@@ -206,10 +209,11 @@ class TopicActivityTest {
 
   private fun launchTopicActivity(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String
   ): ActivityScenario<TopicActivity> {
     val scenario = ActivityScenario.launch<TopicActivity>(
-      TopicActivity.createTopicActivityIntent(context, internalProfileId, topicId)
+      TopicActivity.createTopicActivityIntent(context, internalProfileId, classroomId, topicId)
     )
     testCoroutineDispatchers.runCurrent()
     onView(withId(R.id.topic_name_text_view)).check(matches(isDisplayed()))
diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt
index 9f791022158..dc00a9ca748 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt
@@ -72,6 +72,7 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_1
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.ExplorationStorageModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigModule
@@ -195,7 +196,9 @@ class TopicFragmentTest {
   @Test
   fun testTopicFragment_toolbarTitle_isDisplayedSuccessfully() {
     initializeApplicationComponent(enableExtraTabsUi = false)
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID
+    ).use {
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.topic_toolbar_title)).check(matches(withText("Topic: Fractions")))
     }
@@ -205,13 +208,21 @@ class TopicFragmentTest {
   fun testLessonsTabSpotlight_spotlightAlreadySeen_checkSpotlightNotShown() {
     initializeApplicationComponent(false)
     markSpotlightSeen(FIRST_CHAPTER)
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID
+      )
+    ).use {
       // Mark lessons spotlight seen.
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.close_spotlight_button)).perform(click())
     }
 
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID
+      )
+    ).use {
       testCoroutineDispatchers.runCurrent()
       onView(withText(R.string.topic_lessons_tab_spotlight_hint)).check(doesNotExist())
     }
@@ -223,6 +234,7 @@ class TopicFragmentTest {
     activityTestRule.launchActivity(
       createTopicActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID
       )
     )
@@ -237,6 +249,7 @@ class TopicFragmentTest {
     activityTestRule.launchActivity(
       createTopicPlayStoryActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0
       )
@@ -251,6 +264,7 @@ class TopicFragmentTest {
     launch<TopicActivity>(
       createTopicPlayStoryActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0
       )
@@ -265,6 +279,7 @@ class TopicFragmentTest {
     launch<TopicActivity>(
       createTopicPlayStoryActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID,
         FRACTIONS_STORY_ID_0
       )
@@ -285,7 +300,9 @@ class TopicFragmentTest {
     storyProgressTestHelper.markCompletedRatiosStory1Exp0(profileId, false)
     testCoroutineDispatchers.runCurrent()
     launch<TopicActivity>(
-      createTopicPlayStoryActivityIntent(internalProfileId, RATIOS_TOPIC_ID, RATIOS_STORY_ID_0)
+      createTopicPlayStoryActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID, RATIOS_STORY_ID_0
+      )
     ).use {
       testCoroutineDispatchers.runCurrent()
 
@@ -299,7 +316,9 @@ class TopicFragmentTest {
     markSpotlightSeen(TOPIC_LESSON_TAB)
     markSpotlightSeen(FIRST_CHAPTER)
     launch<TopicActivity>(
-      createTopicPlayStoryActivityIntent(internalProfileId, RATIOS_TOPIC_ID, RATIOS_STORY_ID_0)
+      createTopicPlayStoryActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID, RATIOS_STORY_ID_0
+      )
     ).use {
       testCoroutineDispatchers.runCurrent()
       onView(withText(R.string.topic_revision_tab_spotlight_hint)).check(doesNotExist())
@@ -317,7 +336,9 @@ class TopicFragmentTest {
     storyProgressTestHelper.markCompletedRatiosStory0Exp0(profileId, false)
     storyProgressTestHelper.markCompletedRatiosStory1Exp0(profileId, false)
     launch<TopicActivity>(
-      createTopicPlayStoryActivityIntent(internalProfileId, RATIOS_TOPIC_ID, RATIOS_STORY_ID_0)
+      createTopicPlayStoryActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID, RATIOS_STORY_ID_0
+      )
     ).use {
       testCoroutineDispatchers.runCurrent()
       // Mark revision tab spotlight seen.
@@ -325,7 +346,9 @@ class TopicFragmentTest {
     }
 
     launch<TopicActivity>(
-      createTopicPlayStoryActivityIntent(internalProfileId, RATIOS_TOPIC_ID, RATIOS_STORY_ID_0)
+      createTopicPlayStoryActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID, RATIOS_STORY_ID_0
+      )
     ).use {
       testCoroutineDispatchers.runCurrent()
       onView(withText(R.string.topic_revision_tab_spotlight_hint)).check(doesNotExist())
@@ -340,6 +363,7 @@ class TopicFragmentTest {
     activityTestRule.launchActivity(
       createTopicActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID
       )
     )
@@ -362,6 +386,7 @@ class TopicFragmentTest {
     activityTestRule.launchActivity(
       createTopicActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID
       )
     )
@@ -384,6 +409,7 @@ class TopicFragmentTest {
     activityTestRule.launchActivity(
       createTopicActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID
       )
     )
@@ -405,6 +431,7 @@ class TopicFragmentTest {
     activityTestRule.launchActivity(
       createTopicActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID
       )
     )
@@ -424,6 +451,7 @@ class TopicFragmentTest {
     activityTestRule.launchActivity(
       createTopicActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         FRACTIONS_TOPIC_ID
       )
     )
@@ -434,7 +462,7 @@ class TopicFragmentTest {
   @Test
   fun testTopicFragment_showsTopicFragmentWithMultipleTabs() {
     initializeApplicationComponent(enableExtraTabsUi = false)
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       onView(withId(R.id.topic_tabs_container)).perform(click()).check(matches(isDisplayed()))
     }
   }
@@ -442,7 +470,7 @@ class TopicFragmentTest {
   @Test
   fun testTopicFragment_swipePage_hasSwipedPage() {
     initializeApplicationComponent(enableExtraTabsUi = false)
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       onView(withId(R.id.topic_tabs_viewpager)).check(matches(isDisplayed()))
       onView(withId(R.id.topic_tabs_viewpager)).perform(swipeLeft())
       verifyTabTitleAtPosition(position = 1)
@@ -452,7 +480,7 @@ class TopicFragmentTest {
   @Test
   fun testTopicFragment_enableExtraTabs_infoTopicTab_isDisplayedInTabLayout() {
     initializeApplicationComponent(enableExtraTabsUi = true)
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       onView(
         withText(
           TopicTab.getTabForPosition(
@@ -467,7 +495,7 @@ class TopicFragmentTest {
   @Test
   fun testTopicFragment_disableExtraTabs_infoTopicTab_isNotDisplayedInTabLayout() {
     initializeApplicationComponent(enableExtraTabsUi = false)
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       onView(withText(TopicTab.getTabForPosition(position = INFO_TAB_POSITION, true).name))
         .check(doesNotExist())
     }
@@ -478,6 +506,7 @@ class TopicFragmentTest {
     initializeApplicationComponent(enableExtraTabsUi = false)
     launchTopicPlayStoryActivityIntent(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0
     ).use {
@@ -490,6 +519,7 @@ class TopicFragmentTest {
     initializeApplicationComponent(enableExtraTabsUi = true)
     launchTopicPlayStoryActivityIntent(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0
     ).use {
@@ -500,7 +530,7 @@ class TopicFragmentTest {
   @Test
   fun testTopicFragment_disableExtraTabs_clickOnLessonsTab_showsPlayTabSelected() {
     initializeApplicationComponent(enableExtraTabsUi = false)
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       clickTabAtPosition(position = LESSON_TAB_POSITION_EXTRA_TABS_DISABLED)
       verifyTabTitleAtPosition(position = LESSON_TAB_POSITION_EXTRA_TABS_DISABLED)
     }
@@ -510,7 +540,7 @@ class TopicFragmentTest {
   fun testTopicFragment_clickOnLessonsTab_showsPlayTabWithContentMatched() {
     initializeApplicationComponent(enableExtraTabsUi = true)
     markAllSpotlightsSeen()
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       testCoroutineDispatchers.runCurrent()
       clickTabAtPosition(position = LESSON_TAB_POSITION)
       testCoroutineDispatchers.runCurrent()
@@ -526,7 +556,7 @@ class TopicFragmentTest {
   @Test
   fun testTopicFragment_practiceTabEnabled_practiceTopicTabIsDisplayedInTabLayout() {
     initializeApplicationComponent(enableExtraTabsUi = true)
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       val practiceTab =
         TopicTab.getTabForPosition(position = PRACTICE_TAB_POSITION, enableExtraTopicTabsUi.value)
       onView(withText(practiceTab.name)).check(
@@ -544,7 +574,7 @@ class TopicFragmentTest {
   @Test
   fun testTopicFragment_disableExtraTabs_practiceTopicTabIsNotDisplayedInTabLayout() {
     initializeApplicationComponent(enableExtraTabsUi = false)
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       // Unconditionally retrieve the practice tab name since this test is verifying that it's not
       // enabled.
       val practiceTab =
@@ -556,7 +586,7 @@ class TopicFragmentTest {
   @Test
   fun testTopicFragment_disableExtraTabs_configChange_practiceTopicTabIsNotDisplayed() {
     initializeApplicationComponent(enableExtraTabsUi = false)
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       onView(isRoot()).perform(orientationLandscape())
       testCoroutineDispatchers.runCurrent()
 
@@ -572,7 +602,7 @@ class TopicFragmentTest {
   @Test
   fun testTopicFragment_enableExtraTabs_clickOnPracticeTab_showsPracticeTabSelected() {
     initializeApplicationComponent(enableExtraTabsUi = true)
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       clickTabAtPosition(position = PRACTICE_TAB_POSITION)
       verifyTabTitleAtPosition(position = PRACTICE_TAB_POSITION)
     }
@@ -582,7 +612,7 @@ class TopicFragmentTest {
   fun testTopicFragment_enableExtraTabs_clickOnPracticeTab_showsPracticeTabWithContentMatched() {
     initializeApplicationComponent(enableExtraTabsUi = true)
     markAllSpotlightsSeen()
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       testCoroutineDispatchers.runCurrent()
       clickTabAtPosition(position = PRACTICE_TAB_POSITION)
       testCoroutineDispatchers.runCurrent()
@@ -598,7 +628,7 @@ class TopicFragmentTest {
   @Test
   fun testTopicFragment_clickOnReviewTab_showsReviewTabSelected() {
     initializeApplicationComponent(enableExtraTabsUi = false)
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       clickTabAtPosition(position = REVISION_TAB_POSITION_EXTRA_TABS_DISABLED)
       verifyTabTitleAtPosition(position = REVISION_TAB_POSITION_EXTRA_TABS_DISABLED)
     }
@@ -608,7 +638,7 @@ class TopicFragmentTest {
   fun testTopicFragment_clickOnReviewTab_showsReviewTabWithContentMatched() {
     initializeApplicationComponent(enableExtraTabsUi = false)
     markAllSpotlightsSeen()
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       testCoroutineDispatchers.runCurrent()
       clickTabAtPosition(position = REVISION_TAB_POSITION_EXTRA_TABS_DISABLED)
       testCoroutineDispatchers.runCurrent()
@@ -624,7 +654,7 @@ class TopicFragmentTest {
   @Test
   fun testTopicFragment_enableExtraTabs_clickOnReviewTab_thenInfoTab_showsInfoTab() {
     initializeApplicationComponent(enableExtraTabsUi = true)
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       clickTabAtPosition(position = REVISION_TAB_POSITION)
       clickTabAtPosition(position = INFO_TAB_POSITION)
       verifyTabTitleAtPosition(position = INFO_TAB_POSITION)
@@ -634,7 +664,7 @@ class TopicFragmentTest {
   @Test
   fun enableExtraTabs_clickOnReviewTab_thenInfoTab_showsInfoTabWithContentMatched() {
     initializeApplicationComponent(enableExtraTabsUi = true)
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       testCoroutineDispatchers.runCurrent()
       clickTabAtPosition(position = REVISION_TAB_POSITION)
       testCoroutineDispatchers.runCurrent()
@@ -651,7 +681,7 @@ class TopicFragmentTest {
   @Test
   fun testTopicFragment_clickOnLessonsTab_configChange_showsSameTabAndItsContent() {
     initializeApplicationComponent(enableExtraTabsUi = false)
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       testCoroutineDispatchers.runCurrent()
       clickTabAtPosition(position = LESSON_TAB_POSITION_EXTRA_TABS_DISABLED)
       onView(isRoot()).perform(orientationLandscape())
@@ -670,7 +700,7 @@ class TopicFragmentTest {
   fun enableExtraTabs_clickOnPracticeTab_configChange_showsSameTabAndItsContent() {
     initializeApplicationComponent(enableExtraTabsUi = true)
     markAllSpotlightsSeen()
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       testCoroutineDispatchers.runCurrent()
       clickTabAtPosition(position = PRACTICE_TAB_POSITION)
       testCoroutineDispatchers.runCurrent()
@@ -696,7 +726,7 @@ class TopicFragmentTest {
   fun testTopicFragment_clickOnReviewTab_configChange_showsSameTabAndItsContent() {
     initializeApplicationComponent(enableExtraTabsUi = false)
     markAllSpotlightsSeen()
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       testCoroutineDispatchers.runCurrent()
       clickTabAtPosition(position = REVISION_TAB_POSITION_EXTRA_TABS_DISABLED)
       onView(isRoot()).perform(orientationLandscape())
@@ -716,6 +746,7 @@ class TopicFragmentTest {
     initializeApplicationComponent(enableExtraTabsUi = true)
     launchTopicPlayStoryActivityIntent(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0
     ).use {
@@ -736,6 +767,7 @@ class TopicFragmentTest {
     initializeApplicationComponent(enableExtraTabsUi = false)
     launchTopicPlayStoryActivityIntent(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0
     ).use {
@@ -757,6 +789,7 @@ class TopicFragmentTest {
     markAllSpotlightsSeen()
     launchTopicPlayStoryActivityIntent(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0
     ).use {
@@ -786,6 +819,7 @@ class TopicFragmentTest {
     markAllSpotlightsSeen()
     launchTopicPlayStoryActivityIntent(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0
     ).use {
@@ -802,6 +836,7 @@ class TopicFragmentTest {
     markAllSpotlightsSeen()
     launchTopicPlayStoryActivityIntent(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0
     ).use {
@@ -821,6 +856,7 @@ class TopicFragmentTest {
     markAllSpotlightsSeen()
     launchTopicPlayStoryActivityIntent(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0
     ).use {
@@ -842,6 +878,7 @@ class TopicFragmentTest {
     markAllSpotlightsSeen()
     launchTopicPlayStoryActivityIntent(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0
     ).use {
@@ -861,6 +898,7 @@ class TopicFragmentTest {
     markAllSpotlightsSeen()
     launchTopicPlayStoryActivityIntent(
       internalProfileId,
+      TEST_CLASSROOM_ID_1,
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0
     ).use {
@@ -877,10 +915,15 @@ class TopicFragmentTest {
   /**
    * Creates TopicActivity Intent without a storyId
    */
-  private fun createTopicActivityIntent(internalProfileId: Int, topicId: String): Intent {
+  private fun createTopicActivityIntent(
+    internalProfileId: Int,
+    classroomId: String,
+    topicId: String
+  ): Intent {
     return TopicActivity.createTopicActivityIntent(
       ApplicationProvider.getApplicationContext(),
       internalProfileId,
+      classroomId,
       topicId
     )
   }
@@ -892,12 +935,14 @@ class TopicFragmentTest {
    */
   private fun createTopicPlayStoryActivityIntent(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String
   ): Intent {
     return TopicActivity.createTopicPlayStoryActivityIntent(
       ApplicationProvider.getApplicationContext(),
       internalProfileId,
+      classroomId,
       topicId,
       storyId
     )
@@ -909,9 +954,10 @@ class TopicFragmentTest {
    */
   private fun launchTopicActivityIntent(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String
   ): ActivityScenario<TopicActivity> {
-    return launch(createTopicActivityIntent(internalProfileId, topicId))
+    return launch(createTopicActivityIntent(internalProfileId, classroomId, topicId))
   }
 
   /**
@@ -920,11 +966,12 @@ class TopicFragmentTest {
    */
   private fun launchTopicPlayStoryActivityIntent(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String
   ): ActivityScenario<TopicActivity> {
     return launch<TopicActivity>(
-      createTopicPlayStoryActivityIntent(internalProfileId, topicId, storyId)
+      createTopicPlayStoryActivityIntent(internalProfileId, classroomId, topicId, storyId)
     ).also { testCoroutineDispatchers.runCurrent() }
   }
 
diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/info/TopicInfoFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/info/TopicInfoFragmentTest.kt
index 8cde9282a83..cabd5945931 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/topic/info/TopicInfoFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/topic/info/TopicInfoFragmentTest.kt
@@ -116,6 +116,7 @@ import org.robolectric.annotation.LooperMode
 import javax.inject.Inject
 import javax.inject.Singleton
 
+private const val TEST_CLASSROOM_ID = "test_classroom_id_1"
 private const val TEST_TOPIC_ID = "GJ2rLXRKD5hw"
 private const val TOPIC_NAME = "Fractions"
 
@@ -181,6 +182,7 @@ class TopicInfoFragmentTest {
   fun testTopicInfoFragment_loadFragment_checkTopicName_isCorrect() {
     launchTopicActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID,
       topicId = TEST_TOPIC_ID
     ).use {
       testCoroutineDispatchers.runCurrent()
@@ -192,6 +194,7 @@ class TopicInfoFragmentTest {
   fun testTopicInfoFragment_loadFragmentWithTestTopicId1_checkTopicDescription_isCorrect() {
     launchTopicActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID,
       topicId = TEST_TOPIC_ID
     ).use {
       testCoroutineDispatchers.runCurrent()
@@ -213,6 +216,7 @@ class TopicInfoFragmentTest {
       createTopicActivityIntent(
         context = context,
         internalProfileId = internalProfileId,
+        classroomId = TEST_CLASSROOM_ID,
         topicId = TEST_TOPIC_ID
       )
     )
@@ -232,6 +236,7 @@ class TopicInfoFragmentTest {
       createTopicActivityIntent(
         context = context,
         internalProfileId = internalProfileId,
+        classroomId = TEST_CLASSROOM_ID,
         topicId = TEST_TOPIC_ID
       )
     )
@@ -249,6 +254,7 @@ class TopicInfoFragmentTest {
   fun testTopicInfoFragment_loadFragment_configurationChange_checkTopicThumbnail_isCorrect() {
     launchTopicActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID,
       topicId = TEST_TOPIC_ID
     ).use {
       testCoroutineDispatchers.runCurrent()
@@ -260,6 +266,7 @@ class TopicInfoFragmentTest {
   fun testTopicInfoFragment_loadFragment_checkTopicThumbnail_hasCorrectScaleType() {
     launchTopicActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID,
       topicId = TEST_TOPIC_ID
     ).use {
       testCoroutineDispatchers.runCurrent()
@@ -275,6 +282,7 @@ class TopicInfoFragmentTest {
   fun testTopicInfoFragment_loadFragment_configurationChange_checkTopicName_isCorrect() {
     launchTopicActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID,
       topicId = TEST_TOPIC_ID
     ).use {
       testCoroutineDispatchers.runCurrent()
@@ -296,6 +304,7 @@ class TopicInfoFragmentTest {
   fun testTopicInfoFragment_loadFragment_configurationLandscape_isCorrect() {
     launchTopicActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID,
       topicId = TEST_TOPIC_ID
     ).use {
       testCoroutineDispatchers.runCurrent()
@@ -309,6 +318,7 @@ class TopicInfoFragmentTest {
   fun testTopicInfoFragment_loadFragment_configurationLandscape_imageViewNotDisplayed() {
     launchTopicActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID,
       topicId = TEST_TOPIC_ID
     ).use {
       onView(isRoot()).perform(orientationLandscape())
@@ -321,6 +331,7 @@ class TopicInfoFragmentTest {
   fun testTopicInfoFragment_loadFragment_checkDefaultTopicDescriptionLines_fiveLinesVisible() {
     launchTopicActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID,
       topicId = RATIOS_TOPIC_ID
     ).use {
       onView(withId(R.id.topic_description_text_view))
@@ -339,6 +350,7 @@ class TopicInfoFragmentTest {
   fun testTopicInfoFragment_loadFragment_moreThanFiveLines_seeMoreIsVisible() {
     launchTopicActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID,
       topicId = RATIOS_TOPIC_ID
     ).use {
       onView(withId(R.id.topic_description_text_view)).perform(
@@ -357,6 +369,7 @@ class TopicInfoFragmentTest {
   fun testTopicInfoFragment_loadFragment_seeMoreIsVisible_and_fiveLinesVisible() {
     launchTopicActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID,
       topicId = RATIOS_TOPIC_ID
     ).use {
       onView(withId(R.id.topic_description_text_view)).perform(
@@ -382,6 +395,7 @@ class TopicInfoFragmentTest {
   fun testTopicInfoFragment_loadFragment_clickSeeMore_seeLessVisible() {
     launchTopicActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID,
       topicId = RATIOS_TOPIC_ID
     ).use {
       onView(withId(R.id.topic_description_text_view)).perform(
@@ -401,6 +415,7 @@ class TopicInfoFragmentTest {
   fun testTopicInfoFragment_loadFragment_seeMoreIsVisible() {
     launchTopicActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID,
       topicId = RATIOS_TOPIC_ID
     ).use {
       onView(withId(R.id.see_more_text_view)).perform(scrollTo())
@@ -414,6 +429,7 @@ class TopicInfoFragmentTest {
   fun testTopicInfoFragment_loadFragment_clickSeeMore_textChangesToSeeLess() {
     launchTopicActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID,
       topicId = RATIOS_TOPIC_ID
     ).use {
       onView(withId(R.id.see_more_text_view)).perform(scrollTo())
@@ -425,12 +441,14 @@ class TopicInfoFragmentTest {
 
   private fun launchTopicActivityIntent(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String
   ): ActivityScenario<TopicActivity> {
     val intent =
       TopicActivity.createTopicActivityIntent(
         ApplicationProvider.getApplicationContext(),
         internalProfileId,
+        classroomId,
         topicId
       )
     return ActivityScenario.launch(intent)
diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt
index b7cef7f3d89..075b49e8ac0 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt
@@ -85,6 +85,7 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_1
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.testing.ExplorationStorageTestModule
 import org.oppia.android.domain.exploration.testing.FakeExplorationRetriever
@@ -205,7 +206,11 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_storyName_isCorrect() {
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       verifyTextOnStorySummaryListItemAtPosition(itemPosition = 1, stringToMatch = "Ratios: Part 1")
     }
@@ -213,7 +218,11 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_chapterCountTextMultiple_isCorrect() {
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       verifyTextOnStorySummaryListItemAtPosition(itemPosition = 2, stringToMatch = "2 Chapters")
     }
@@ -225,7 +234,11 @@ class TopicLessonsFragmentTest {
       profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       verifyTextOnStorySummaryListItemAtPosition(itemPosition = 1, stringToMatch = "100%")
     }
@@ -237,7 +250,11 @@ class TopicLessonsFragmentTest {
       profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       verifyProgressContentDescriptionAtPosition(itemPosition = 1, stringToMatch = "100% Completed")
     }
@@ -249,7 +266,11 @@ class TopicLessonsFragmentTest {
       profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       verifyProgressContentDescriptionAtPosition(itemPosition = 1, stringToMatch = "0% In Progress")
     }
@@ -265,7 +286,11 @@ class TopicLessonsFragmentTest {
       profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       verifyProgressContentDescriptionAtPosition(
         itemPosition = 1,
@@ -276,7 +301,11 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_noStoryProgress_contentDescriptionIsCorrect() {
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       verifyProgressContentDescriptionAtPosition(itemPosition = 1, stringToMatch = "0% In Progress")
     }
@@ -292,7 +321,11 @@ class TopicLessonsFragmentTest {
       profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       verifyTextOnStorySummaryListItemAtPosition(itemPosition = 2, stringToMatch = "50%")
     }
@@ -300,7 +333,11 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_configurationChange_storyName_isCorrect() {
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       onView(isRoot()).perform(orientationLandscape())
       verifyTextOnStorySummaryListItemAtPosition(itemPosition = 1, stringToMatch = "Ratios: Part 1")
@@ -310,7 +347,11 @@ class TopicLessonsFragmentTest {
   @Test
   @Config(qualifiers = "land-xxhdpi")
   fun testLessonsPlayFragment_loadRatiosTopic_configurationLandscape_storyName_isCorrect() {
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       verifyTextOnStorySummaryListItemAtPosition(itemPosition = 1, stringToMatch = "Ratios: Part 1")
     }
@@ -318,13 +359,18 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_clickStoryItem_opensStoryActivityWithCorrectIntent() {
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.story_name_text_view)
 
       val args = StoryActivityParams.newBuilder().apply {
         this.storyId = RATIOS_STORY_ID_0
         this.topicId = RATIOS_TOPIC_ID
+        this.classroomId = TEST_CLASSROOM_ID_1
       }.build()
       intended(hasComponent(StoryActivity::class.java.name))
       intended(hasProtoExtra(STORY_ACTIVITY_PARAMS_KEY, args))
@@ -333,14 +379,22 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_chapterListIsNotVisible() {
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       onView(withId(R.id.chapter_recycler_view)).check(doesNotExist())
     }
   }
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_chapterNotStartedIsCorrectlyDisplayed() {
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       onView(
@@ -355,7 +409,11 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_chapterLockedIsCorrectlyDisplayed() {
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       onView(
@@ -370,7 +428,11 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_chapterIsLocked_contentDescriptionIsCorrect() {
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       onView(
@@ -398,7 +460,11 @@ class TopicLessonsFragmentTest {
       profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       onView(
@@ -417,7 +483,11 @@ class TopicLessonsFragmentTest {
       profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       onView(
@@ -445,7 +515,11 @@ class TopicLessonsFragmentTest {
       profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       onView(
@@ -465,7 +539,11 @@ class TopicLessonsFragmentTest {
       profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       onView(
@@ -488,7 +566,11 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_configChange_chapterLockedIsCorrectlyDisplayed() {
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       onView(isRoot()).perform(orientationLandscape())
@@ -508,7 +590,11 @@ class TopicLessonsFragmentTest {
       profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       onView(isRoot()).perform(orientationLandscape())
@@ -529,7 +615,11 @@ class TopicLessonsFragmentTest {
       profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       onView(isRoot()).perform(orientationLandscape())
@@ -545,7 +635,11 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_configChange_chapterNotStartedIsCorrectlyDisplayed() {
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       onView(isRoot()).perform(orientationLandscape())
@@ -561,7 +655,11 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_default_arrowDown() {
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       onView(
         atPositionOnView(
@@ -582,6 +680,7 @@ class TopicLessonsFragmentTest {
     launch<TopicActivity>(
       createTopicPlayStoryActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0
       )
@@ -609,7 +708,11 @@ class TopicLessonsFragmentTest {
       version = FRACTIONS_STORY_0_EXPLORATION_0_CURRENT_VERSION,
     )
     testCoroutineDispatchers.runCurrent()
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       scrollToPosition(position = 1)
@@ -627,6 +730,7 @@ class TopicLessonsFragmentTest {
         explorationId = FRACTIONS_EXPLORATION_ID_0
         storyId = FRACTIONS_STORY_ID_0
         topicId = FRACTIONS_TOPIC_ID
+        classroomId = TEST_CLASSROOM_ID_1
         profileId = ProfileId.newBuilder().apply { internalId = internalProfileId }.build()
         parentScreen = ExplorationActivityParams.ParentScreen.TOPIC_SCREEN_LESSONS_TAB
         checkpoint = ExplorationCheckpoint.newBuilder().apply {
@@ -660,7 +764,11 @@ class TopicLessonsFragmentTest {
       profileId = profileId,
       version = 1 // Old version, but it doesn't matter since the new version is incompatible.
     )
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       scrollToPosition(position = 1)
@@ -678,6 +786,7 @@ class TopicLessonsFragmentTest {
         explorationId = FRACTIONS_EXPLORATION_ID_0
         storyId = FRACTIONS_STORY_ID_0
         topicId = FRACTIONS_TOPIC_ID
+        classroomId = TEST_CLASSROOM_ID_1
         profileId = ProfileId.newBuilder().apply { internalId = internalProfileId }.build()
         isCheckpointingEnabled = true
         parentScreen = ExplorationActivityParams.ParentScreen.TOPIC_SCREEN_LESSONS_TAB
@@ -693,7 +802,11 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadFractionsTopic_clickChap_chapterMarkedAsNotStarted_opensExpAct() {
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       scrollToPosition(position = 1)
@@ -711,6 +824,7 @@ class TopicLessonsFragmentTest {
         explorationId = FRACTIONS_EXPLORATION_ID_0
         storyId = FRACTIONS_STORY_ID_0
         topicId = FRACTIONS_TOPIC_ID
+        classroomId = TEST_CLASSROOM_ID_1
         profileId = ProfileId.newBuilder().apply { internalId = internalProfileId }.build()
         isCheckpointingEnabled = true
         parentScreen = ExplorationActivityParams.ParentScreen.TOPIC_SCREEN_LESSONS_TAB
@@ -731,7 +845,11 @@ class TopicLessonsFragmentTest {
       profileId = profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       scrollToPosition(position = 1)
@@ -749,6 +867,7 @@ class TopicLessonsFragmentTest {
         explorationId = FRACTIONS_EXPLORATION_ID_0
         storyId = FRACTIONS_STORY_ID_0
         topicId = FRACTIONS_TOPIC_ID
+        classroomId = TEST_CLASSROOM_ID_1
         profileId = ProfileId.newBuilder().apply { internalId = internalProfileId }.build()
         isCheckpointingEnabled = true
         parentScreen = ExplorationActivityParams.ParentScreen.TOPIC_SCREEN_LESSONS_TAB
@@ -769,7 +888,11 @@ class TopicLessonsFragmentTest {
       profileId = profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       scrollToPosition(position = 1)
@@ -786,6 +909,7 @@ class TopicLessonsFragmentTest {
         explorationId = FRACTIONS_EXPLORATION_ID_0
         storyId = FRACTIONS_STORY_ID_0
         topicId = FRACTIONS_TOPIC_ID
+        classroomId = TEST_CLASSROOM_ID_1
         profileId = ProfileId.newBuilder().apply { internalId = internalProfileId }.build()
         isCheckpointingEnabled = false
         parentScreen = ExplorationActivityParams.ParentScreen.TOPIC_SCREEN_LESSONS_TAB
@@ -801,7 +925,11 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_clickExpandListIconIndex1_clickExpandListIconIndex2_chapterListForIndex1IsNotDisplayed() { // ktlint-disable max-line-length
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       scrollToPosition(position = 1)
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
@@ -822,7 +950,11 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_clickExpandListIconIndex2_clickExpandListIconIndex1_chapterListForIndex2IsNotDisplayed() { // ktlint-disable max-line-length
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       scrollToPosition(position = 2)
       clickStoryItem(position = 2, targetViewId = R.id.chapter_list_drop_down_icon)
@@ -841,7 +973,11 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_clickExpandListIconIndex1_configurationChange_chapterListIsVisible() { // ktlint-disable max-line-length
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       onView(isRoot()).perform(orientationLandscape())
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
@@ -859,7 +995,11 @@ class TopicLessonsFragmentTest {
   @Test
   @Config(qualifiers = "land-xxhdpi")
   fun testLessonsPlayFragment_loadRatiosTopic_clickExpandListIconIndex1_configurationLandscape_chapterListIsVisible() { // ktlint-disable max-line-length
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       scrollToPosition(position = 1)
@@ -879,7 +1019,11 @@ class TopicLessonsFragmentTest {
       profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       scrollToPosition(position = 1)
@@ -894,7 +1038,11 @@ class TopicLessonsFragmentTest {
       profileId,
       timestampOlderThanOneWeek = false
     )
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, RATIOS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, RATIOS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       clickStoryItem(position = 1, targetViewId = R.id.chapter_list_drop_down_icon)
       scrollToPosition(position = 1)
@@ -909,7 +1057,9 @@ class TopicLessonsFragmentTest {
     launch<TopicActivity>(
       createTopicPlayStoryActivityIntent(
         internalProfileId,
-        RATIOS_TOPIC_ID, RATIOS_STORY_ID_0
+        TEST_CLASSROOM_ID_1,
+        RATIOS_TOPIC_ID,
+        RATIOS_STORY_ID_0
       )
     ).use {
       scrollToPosition(position = 1)
@@ -928,6 +1078,7 @@ class TopicLessonsFragmentTest {
     launch<TopicActivity>(
       createTopicPlayStoryActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0
       )
@@ -949,6 +1100,7 @@ class TopicLessonsFragmentTest {
     launch<TopicActivity>(
       createTopicPlayStoryActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_1,
         RATIOS_TOPIC_ID,
         RATIOS_STORY_ID_0
       )
@@ -969,7 +1121,11 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonsPlayFragment_loadRatiosTopic_checkDropDownIconWithScreenReader_isClickable() {
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID
+      )
+    ).use {
       fakeAccessibilityService.setScreenReaderEnabled(true)
       clickLessonTab()
       testCoroutineDispatchers.runCurrent()
@@ -987,7 +1143,11 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonPlayFragment_loadRatiosTopic_checkDropDownIconWithoutScreenReader_isNotClickable() {
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       testCoroutineDispatchers.runCurrent()
       onView(
@@ -1004,7 +1164,11 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonPlayFragment_loadRatiosTopic_checkStoryContainerWithScreenReader_isNotClickable() {
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID
+      )
+    ).use {
       fakeAccessibilityService.setScreenReaderEnabled(true)
       clickLessonTab()
       testCoroutineDispatchers.runCurrent()
@@ -1022,7 +1186,11 @@ class TopicLessonsFragmentTest {
 
   @Test
   fun testLessonPlayFragment_loadRatiosTopic_checkStoryContainerWithoutScreenReader_isClickable() {
-    launch<TopicActivity>(createTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID)).use {
+    launch<TopicActivity>(
+      createTopicActivityIntent(
+        internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID
+      )
+    ).use {
       clickLessonTab()
       testCoroutineDispatchers.runCurrent()
       onView(
@@ -1046,22 +1214,29 @@ class TopicLessonsFragmentTest {
     testCoroutineDispatchers.runCurrent()
   }
 
-  private fun createTopicActivityIntent(internalProfileId: Int, topicId: String): Intent {
+  private fun createTopicActivityIntent(
+    internalProfileId: Int,
+    classroomId: String,
+    topicId: String
+  ): Intent {
     return TopicActivity.createTopicActivityIntent(
       ApplicationProvider.getApplicationContext(),
       internalProfileId,
+      classroomId,
       topicId
     )
   }
 
   private fun createTopicPlayStoryActivityIntent(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String
   ): Intent {
     return TopicActivity.createTopicPlayStoryActivityIntent(
       ApplicationProvider.getApplicationContext(),
       internalProfileId,
+      classroomId,
       topicId,
       storyId
     )
diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentTest.kt
index 13ea4f3bf82..fd5c8f4117f 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentTest.kt
@@ -71,6 +71,7 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_1
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.ExplorationStorageModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigModule
@@ -166,7 +167,7 @@ class TopicPracticeFragmentTest {
 
   @Test
   fun testTopicPracticeFragment_loadFragment_displaySubtopics_startButtonIsInactive() {
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       clickPracticeTab()
       onView(
         atPositionOnView(
@@ -202,7 +203,7 @@ class TopicPracticeFragmentTest {
 
   @Test
   fun testTopicPracticeFragment_loadFragment_selectSubtopics_isSuccessful() {
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       clickPracticeTab()
       clickPracticeItem(position = 1, targetViewId = R.id.subtopic_check_box)
       onView(
@@ -225,7 +226,7 @@ class TopicPracticeFragmentTest {
 
   @Test
   fun testTopicPracticeFragment_loadFragment_selectSubtopics_startButtonIsActive() {
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       clickPracticeTab()
       clickPracticeItem(position = 1, targetViewId = R.id.subtopic_check_box)
       testCoroutineDispatchers.runCurrent()
@@ -242,7 +243,7 @@ class TopicPracticeFragmentTest {
 
   @Test
   fun testTopicPracticeFragment_loadFragment_selectSubtopics_thenDeselect_selectsCorrectTopic() {
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       clickPracticeTab()
       clickPracticeItem(position = 1, targetViewId = R.id.subtopic_check_box)
       clickPracticeItem(position = 1, targetViewId = R.id.subtopic_check_box)
@@ -258,7 +259,7 @@ class TopicPracticeFragmentTest {
 
   @Test
   fun testTopicPracticeFragment_loadFragment_selectSubtopics_thenDeselect_startButtonIsInactive() {
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       clickPracticeTab()
       clickPracticeItem(position = 1, targetViewId = R.id.subtopic_check_box)
       clickPracticeItem(position = 1, targetViewId = R.id.subtopic_check_box)
@@ -277,7 +278,7 @@ class TopicPracticeFragmentTest {
   @Test
   fun testTopicPracticeFragment_loadFragment_selectSubtopics_clickStartButton_skillListTransferSuccessfully() { // ktlint-disable max-line-length
     testCoroutineDispatchers.unregisterIdlingResource()
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       clickPracticeTab()
       clickPracticeItem(position = 1, targetViewId = R.id.subtopic_check_box)
       scrollToPosition(position = 5)
@@ -290,7 +291,7 @@ class TopicPracticeFragmentTest {
 
   @Test
   fun testTopicPracticeFragment_loadFragment_selectSkills_configurationChange_skillsAreSelected() {
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       clickPracticeTab()
       clickPracticeItem(position = 1, targetViewId = R.id.subtopic_check_box)
       testCoroutineDispatchers.runCurrent()
@@ -307,7 +308,7 @@ class TopicPracticeFragmentTest {
 
   @Test
   fun testTopicPracticeFragment_loadFragment_configurationChange_startButtonRemainsInactive() {
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       clickPracticeTab()
       scrollToPosition(position = 5)
       testCoroutineDispatchers.runCurrent()
@@ -332,7 +333,7 @@ class TopicPracticeFragmentTest {
 
   @Test
   fun testTopicPracticeFragment_loadFragment_selectSkills_configChange_startButtonRemainsActive() {
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       clickPracticeTab()
       clickPracticeItem(position = 1, targetViewId = R.id.subtopic_check_box)
       onView(isRoot()).perform(orientationLandscape())
@@ -350,7 +351,7 @@ class TopicPracticeFragmentTest {
 
   @Test
   fun testTopicPracticeFragment_loadFragment_changeOrientation_titleIsCorrect() {
-    launchTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID_1, FRACTIONS_TOPIC_ID).use {
       clickPracticeTab()
       onView(
         atPositionOnView(
@@ -384,12 +385,14 @@ class TopicPracticeFragmentTest {
 
   private fun launchTopicActivityIntent(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String
   ): ActivityScenario<TopicActivity> {
     val intent =
       TopicActivity.createTopicActivityIntent(
         ApplicationProvider.getApplicationContext(),
         internalProfileId,
+        classroomId,
         topicId
       )
     return ActivityScenario.launch(intent)
diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentTest.kt
index 291281559be..dec1050be90 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentTest.kt
@@ -71,6 +71,7 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_1
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.ExplorationStorageModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigModule
@@ -170,6 +171,7 @@ class TopicRevisionFragmentTest {
   fun testTopicRevisionFragment_loadFragment_displayRevisionTopics_isSuccessful() {
     launchTopicActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID_1,
       topicId = FRACTIONS_TOPIC_ID
     ).use {
       testCoroutineDispatchers.runCurrent()
@@ -183,6 +185,7 @@ class TopicRevisionFragmentTest {
   fun testTopicRevisionFragment_loadFragment_selectRevisionTopics_opensRevisionCardActivity() {
     launchTopicActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID_1,
       topicId = FRACTIONS_TOPIC_ID
     ).use {
       testCoroutineDispatchers.runCurrent()
@@ -202,6 +205,7 @@ class TopicRevisionFragmentTest {
   fun testTopicRevisionFragment_loadFragment_checkTopicThumbnail_isCorrect() {
     launchTopicActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID_1,
       topicId = FRACTIONS_TOPIC_ID
     ).use {
       testCoroutineDispatchers.runCurrent()
@@ -226,6 +230,7 @@ class TopicRevisionFragmentTest {
   fun testTopicPracticeFragment_loadFragment_configurationChange_revisionSubtopicsAreDisplayed() {
     launchTopicActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID_1,
       topicId = FRACTIONS_TOPIC_ID
     ).use {
       testCoroutineDispatchers.runCurrent()
@@ -240,6 +245,7 @@ class TopicRevisionFragmentTest {
   fun testTopicRevisionFragment_loadFragment_configurationChange_checkTopicThumbnail_isCorrect() {
     launchTopicActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID_1,
       topicId = FRACTIONS_TOPIC_ID
     ).use {
       testCoroutineDispatchers.runCurrent()
@@ -265,6 +271,7 @@ class TopicRevisionFragmentTest {
   fun testTopicRevisionFragment_loadFragment_checkTopicThumbnail_hasCorrectScaleType() {
     launchTopicActivityIntent(
       internalProfileId = internalProfileId,
+      classroomId = TEST_CLASSROOM_ID_1,
       topicId = FRACTIONS_TOPIC_ID
     ).use {
       testCoroutineDispatchers.runCurrent()
@@ -289,20 +296,30 @@ class TopicRevisionFragmentTest {
     testCoroutineDispatchers.runCurrent()
   }
 
-  private fun createTopicActivityIntent(internalProfileId: Int, topicId: String): Intent {
+  private fun createTopicActivityIntent(
+    internalProfileId: Int,
+    classroomId: String,
+    topicId: String
+  ): Intent {
     return TopicActivity.createTopicActivityIntent(
       context = ApplicationProvider.getApplicationContext(),
       internalProfileId = internalProfileId,
+      classroomId = classroomId,
       topicId = topicId
     )
   }
 
   private fun launchTopicActivityIntent(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String
   ): ActivityScenario<TopicActivity> {
     return launch(
-      createTopicActivityIntent(internalProfileId = internalProfileId, topicId = topicId)
+      createTopicActivityIntent(
+        internalProfileId = internalProfileId,
+        classroomId = classroomId,
+        topicId = topicId
+      )
     )
   }
 
diff --git a/app/src/test/java/org/oppia/android/app/activity/ActivityIntentFactoriesTest.kt b/app/src/test/java/org/oppia/android/app/activity/ActivityIntentFactoriesTest.kt
index 1f47e95bbc2..4a75e8d367a 100644
--- a/app/src/test/java/org/oppia/android/app/activity/ActivityIntentFactoriesTest.kt
+++ b/app/src/test/java/org/oppia/android/app/activity/ActivityIntentFactoriesTest.kt
@@ -115,7 +115,9 @@ class ActivityIntentFactoriesTest {
   fun testTopicActivityIntentFactory_createIntent_returnsIntentToStartTopicActivity() {
     val intent =
       getTopicActivityIntentFactory().createIntent(
-        ProfileId.getDefaultInstance(), topicId = "test_topic_id"
+        ProfileId.getDefaultInstance(),
+        classroomId = "test_classroom_id",
+        topicId = "test_topic_id"
       )
     val args = intent.getProtoExtra(
       TopicActivity.TOPIC_ACTIVITY_PARAMS_KEY,
@@ -132,7 +134,10 @@ class ActivityIntentFactoriesTest {
   fun testTopicActivityIntentFactory_createIntent_withStoryId_returnsIntentToStartTopicActivity() {
     val intent =
       getTopicActivityIntentFactory().createIntent(
-        ProfileId.getDefaultInstance(), topicId = "test_topic_id", storyId = "test_story_id"
+        ProfileId.getDefaultInstance(),
+        classroomId = "test_classroom_id",
+        topicId = "test_topic_id",
+        storyId = "test_story_id"
       )
     val args = intent.getProtoExtra(
       TopicActivity.TOPIC_ACTIVITY_PARAMS_KEY,
diff --git a/app/src/test/java/org/oppia/android/app/player/exploration/ExplorationActivityLocalTest.kt b/app/src/test/java/org/oppia/android/app/player/exploration/ExplorationActivityLocalTest.kt
index 823861bc358..c62ba27d2a0 100644
--- a/app/src/test/java/org/oppia/android/app/player/exploration/ExplorationActivityLocalTest.kt
+++ b/app/src/test/java/org/oppia/android/app/player/exploration/ExplorationActivityLocalTest.kt
@@ -58,6 +58,7 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_0
 import org.oppia.android.domain.exploration.ExplorationDataController
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.ExplorationStorageModule
@@ -148,6 +149,7 @@ class ExplorationActivityLocalTest {
     setUpTestApplicationComponent()
     getApplicationDependencies(
       internalProfileId,
+      TEST_CLASSROOM_ID_0,
       TEST_TOPIC_ID_0,
       TEST_STORY_ID_0,
       TEST_EXPLORATION_ID_2
@@ -155,6 +157,7 @@ class ExplorationActivityLocalTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -179,6 +182,7 @@ class ExplorationActivityLocalTest {
 
     getApplicationDependencies(
       internalProfileId,
+      TEST_CLASSROOM_ID_0,
       TEST_TOPIC_ID_0,
       TEST_STORY_ID_0,
       TEST_EXPLORATION_ID_2
@@ -188,6 +192,7 @@ class ExplorationActivityLocalTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -195,6 +200,7 @@ class ExplorationActivityLocalTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -226,6 +232,7 @@ class ExplorationActivityLocalTest {
     setUpTestWithNpsEnabled()
     getApplicationDependencies(
       internalProfileId,
+      TEST_CLASSROOM_ID_0,
       TEST_TOPIC_ID_0,
       TEST_STORY_ID_0,
       TEST_EXPLORATION_ID_2
@@ -239,6 +246,7 @@ class ExplorationActivityLocalTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -246,6 +254,7 @@ class ExplorationActivityLocalTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -272,6 +281,7 @@ class ExplorationActivityLocalTest {
 
     getApplicationDependencies(
       internalProfileId,
+      TEST_CLASSROOM_ID_0,
       TEST_TOPIC_ID_0,
       TEST_STORY_ID_0,
       TEST_EXPLORATION_ID_2
@@ -281,6 +291,7 @@ class ExplorationActivityLocalTest {
     launch<ExplorationActivity>(
       createExplorationActivityIntent(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -288,6 +299,7 @@ class ExplorationActivityLocalTest {
     ).use {
       explorationDataController.startPlayingNewExploration(
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         TEST_EXPLORATION_ID_2
@@ -345,6 +357,7 @@ class ExplorationActivityLocalTest {
 
   private fun getApplicationDependencies(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String
@@ -355,6 +368,7 @@ class ExplorationActivityLocalTest {
         explorationDataController = activity.explorationDataController
         explorationDataController.startPlayingNewExploration(
           internalProfileId,
+          classroomId,
           topicId,
           storyId,
           explorationId
@@ -365,6 +379,7 @@ class ExplorationActivityLocalTest {
 
   private fun createExplorationActivityIntent(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String
@@ -372,6 +387,7 @@ class ExplorationActivityLocalTest {
     return ExplorationActivity.createExplorationActivityIntent(
       ApplicationProvider.getApplicationContext(),
       ProfileId.newBuilder().apply { internalId = internalProfileId }.build(),
+      classroomId,
       topicId,
       storyId,
       explorationId,
diff --git a/app/src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest.kt b/app/src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest.kt
index 660b774ecbb..b40a46e7ce4 100644
--- a/app/src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest.kt
+++ b/app/src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest.kt
@@ -114,6 +114,7 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_0
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.ExplorationStorageModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigModule
@@ -2231,6 +2232,7 @@ class StateFragmentLocalTest {
       StateFragmentTestActivity.createTestActivityIntent(
         context,
         profileId.internalId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         explorationId,
diff --git a/app/src/test/java/org/oppia/android/app/story/StoryActivityLocalTest.kt b/app/src/test/java/org/oppia/android/app/story/StoryActivityLocalTest.kt
index 6489f14d675..8cee1756370 100644
--- a/app/src/test/java/org/oppia/android/app/story/StoryActivityLocalTest.kt
+++ b/app/src/test/java/org/oppia/android/app/story/StoryActivityLocalTest.kt
@@ -88,6 +88,7 @@ import org.robolectric.annotation.LooperMode
 import javax.inject.Inject
 import javax.inject.Singleton
 
+private const val TEST_CLASSROOM_ID = "test_classroom_id_1"
 private const val TEST_TOPIC_ID = "GJ2rLXRKD5hw"
 private const val TEST_STORY_ID = "GJ2rLXRKD5hw"
 
@@ -119,7 +120,7 @@ class StoryActivityLocalTest {
   @Test
   fun testStoryActivity_onLaunch_logsEvent() {
     ActivityScenario.launch<StoryActivity>(
-      createStoryActivityIntent(internalProfileId, TEST_TOPIC_ID, TEST_STORY_ID)
+      createStoryActivityIntent(internalProfileId, TEST_CLASSROOM_ID, TEST_TOPIC_ID, TEST_STORY_ID)
     ).use {
       testCoroutineDispatchers.runCurrent()
       val event = fakeAnalyticsEventLogger.getMostRecentEvent()
@@ -133,12 +134,14 @@ class StoryActivityLocalTest {
 
   private fun createStoryActivityIntent(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String
   ): Intent {
     return StoryActivity.createStoryActivityIntent(
       ApplicationProvider.getApplicationContext(),
       internalProfileId,
+      classroomId,
       topicId,
       storyId
     )
diff --git a/app/src/test/java/org/oppia/android/app/testing/player/state/StateFragmentAccessibilityTest.kt b/app/src/test/java/org/oppia/android/app/testing/player/state/StateFragmentAccessibilityTest.kt
index 0323e8bb7fe..c36293a6e29 100644
--- a/app/src/test/java/org/oppia/android/app/testing/player/state/StateFragmentAccessibilityTest.kt
+++ b/app/src/test/java/org/oppia/android/app/testing/player/state/StateFragmentAccessibilityTest.kt
@@ -51,6 +51,7 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_0
 import org.oppia.android.domain.exploration.ExplorationProgressModule
 import org.oppia.android.domain.exploration.ExplorationStorageModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigModule
@@ -179,6 +180,7 @@ class StateFragmentAccessibilityTest {
       StateFragmentTestActivity.createTestActivityIntent(
         context,
         internalProfileId,
+        TEST_CLASSROOM_ID_0,
         TEST_TOPIC_ID_0,
         TEST_STORY_ID_0,
         explorationId,
diff --git a/app/src/test/java/org/oppia/android/app/topic/info/TopicInfoFragmentLocalTest.kt b/app/src/test/java/org/oppia/android/app/topic/info/TopicInfoFragmentLocalTest.kt
index cf22fc38f93..8c61974dcfe 100644
--- a/app/src/test/java/org/oppia/android/app/topic/info/TopicInfoFragmentLocalTest.kt
+++ b/app/src/test/java/org/oppia/android/app/topic/info/TopicInfoFragmentLocalTest.kt
@@ -86,6 +86,7 @@ import org.robolectric.annotation.LooperMode
 import javax.inject.Inject
 import javax.inject.Singleton
 
+private const val TEST_CLASSROOM_ID = "test_classroom_id_1"
 private const val TEST_TOPIC_ID = "GJ2rLXRKD5hw"
 
 @RunWith(AndroidJUnit4::class)
@@ -110,7 +111,7 @@ class TopicInfoFragmentLocalTest {
   @Test
   fun testTopicInfoFragment_onLaunch_logsEvent() {
     TestPlatformParameterModule.forceEnableExtraTopicTabsUi(true)
-    launchTopicActivityIntent(internalProfileId, TEST_TOPIC_ID).use {
+    launchTopicActivityIntent(internalProfileId, TEST_CLASSROOM_ID, TEST_TOPIC_ID).use {
       testCoroutineDispatchers.runCurrent()
       val event = fakeAnalyticsEventLogger.getMostRecentEvent()
 
@@ -122,12 +123,14 @@ class TopicInfoFragmentLocalTest {
 
   private fun launchTopicActivityIntent(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String
   ): ActivityScenario<TopicActivity> {
     val intent =
       TopicActivity.createTopicActivityIntent(
         ApplicationProvider.getApplicationContext(),
         internalProfileId,
+        classroomId,
         topicId
       )
     return ActivityScenario.launch(intent)
diff --git a/app/src/test/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentLocalTest.kt b/app/src/test/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentLocalTest.kt
index c02f3d11f1b..080512c02fb 100644
--- a/app/src/test/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentLocalTest.kt
+++ b/app/src/test/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentLocalTest.kt
@@ -85,6 +85,7 @@ import org.robolectric.annotation.LooperMode
 import javax.inject.Inject
 import javax.inject.Singleton
 
+private const val TEST_CLASSROOM_ID = "test_classroom_id_1"
 private const val TEST_TOPIC_ID = "GJ2rLXRKD5hw"
 private const val TEST_STORY_ID = "GJ2rLXRKD5hw"
 
@@ -109,7 +110,9 @@ class TopicLessonsFragmentLocalTest {
 
   @Test
   fun testTopicLessonsFragment_onLaunch_logsEvent() {
-    launchTopicActivityIntent(internalProfileId, TEST_TOPIC_ID, TEST_STORY_ID).use {
+    launchTopicActivityIntent(
+      internalProfileId, TEST_CLASSROOM_ID, TEST_TOPIC_ID, TEST_STORY_ID
+    ).use {
       testCoroutineDispatchers.runCurrent()
       val event = fakeAnalyticsEventLogger.getMostRecentEvent()
 
@@ -122,6 +125,7 @@ class TopicLessonsFragmentLocalTest {
 
   private fun launchTopicActivityIntent(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String
   ): ActivityScenario<TopicActivity> {
@@ -129,6 +133,7 @@ class TopicLessonsFragmentLocalTest {
       TopicActivity.createTopicPlayStoryActivityIntent(
         ApplicationProvider.getApplicationContext(),
         internalProfileId,
+        classroomId,
         topicId,
         storyId
       )
diff --git a/domain/src/main/java/org/oppia/android/domain/classroom/ClassroomController.kt b/domain/src/main/java/org/oppia/android/domain/classroom/ClassroomController.kt
index 80175c999e5..20cc3ee832e 100644
--- a/domain/src/main/java/org/oppia/android/domain/classroom/ClassroomController.kt
+++ b/domain/src/main/java/org/oppia/android/domain/classroom/ClassroomController.kt
@@ -84,6 +84,20 @@ class ClassroomController @Inject constructor(
     }
   }
 
+  /**
+   * Returns the classroomId of the classroom to which the topic with the given [topicId]
+   * belongs to.
+   */
+  fun getClassroomIdByTopicId(topicId: String): String {
+    var classroomId = ""
+    loadClassrooms().forEach {
+      if (it.topicPrerequisitesMap.keys.contains(topicId)) {
+        classroomId = it.id
+      }
+    }
+    return classroomId
+  }
+
   private fun createClassroomList(
     contentLocale: OppiaLocale.ContentLocale
   ): ClassroomList {
@@ -318,6 +332,81 @@ class ClassroomController @Inject constructor(
       .setFirstStoryId(firstStoryId)
       .build()
   }
+
+  private fun loadClassrooms(): List<ClassroomRecord> {
+    return if (loadLessonProtosFromAssets) {
+      assetRepository.loadProtoFromLocalAssets(
+        assetName = "classrooms",
+        baseMessage = ClassroomIdList.getDefaultInstance()
+      ).classroomIdsList.map { classroomId ->
+        loadClassroomById(classroomId)
+      }
+    } else loadClassroomsFromJson()
+  }
+
+  private fun loadClassroomsFromJson(): List<ClassroomRecord> {
+    // Load the classrooms.json file.
+    val classroomIdsObj = jsonAssetRetriever.loadJsonFromAsset("classrooms.json")
+    checkNotNull(classroomIdsObj) { "Failed to load classrooms.json." }
+    val classroomIds = classroomIdsObj.optJSONArray("classroom_id_list")
+    checkNotNull(classroomIds) { "classrooms.json is missing classroom IDs." }
+
+    // Initialize a list to store the [ClassroomRecord]s.
+    val classroomRecords = mutableListOf<ClassroomRecord>()
+
+    // Iterate over all classroomIds and load each classroom's JSON.
+    for (i in 0 until classroomIds.length()) {
+      val classroomId = checkNotNull(classroomIds.optString(i)) {
+        "Expected non-null classroom ID at index $i."
+      }
+      val classroomRecord = loadClassroomById(classroomId)
+      classroomRecords.add(classroomRecord)
+    }
+
+    return classroomRecords
+  }
+
+  private fun loadClassroomById(classroomId: String): ClassroomRecord {
+    return if (loadLessonProtosFromAssets) {
+      assetRepository.tryLoadProtoFromLocalAssets(
+        assetName = classroomId,
+        defaultMessage = ClassroomRecord.getDefaultInstance()
+      ) ?: ClassroomRecord.getDefaultInstance()
+    } else loadClassroomByIdFromJson(classroomId)
+  }
+
+  private fun loadClassroomByIdFromJson(classroomId: String): ClassroomRecord {
+    // Load the classroom obj.
+    val classroomObj = jsonAssetRetriever.loadJsonFromAsset("$classroomId.json")
+    checkNotNull(classroomObj) { "Failed to load $classroomId.json." }
+
+    // Load the topic prerequisite map.
+    val topicPrereqsObj = checkNotNull(classroomObj.optJSONObject("topic_prerequisites")) {
+      "Expected classroom to have non-null topic_prerequisites."
+    }
+    val topicPrereqs = topicPrereqsObj.keys().asSequence().associateWith { topicId ->
+      val topicIdArray = checkNotNull(topicPrereqsObj.optJSONArray(topicId)) {
+        "Expected topic $topicId to have a non-null string list."
+      }
+      return@associateWith List(topicIdArray.length()) { index ->
+        checkNotNull(topicIdArray.optString(index)) {
+          "Expected topic $topicId to have non-null string at index $index."
+        }
+      }
+    }
+    return ClassroomRecord.newBuilder().apply {
+      id = checkNotNull(classroomObj.optString("classroom_id")) {
+        "Expected classroom to have ID."
+      }
+      putAllTopicPrerequisites(
+        topicPrereqs.mapValues { (_, topicIds) ->
+          ClassroomRecord.TopicIdList.newBuilder().apply {
+            addAllTopicIds(topicIds)
+          }.build()
+        }
+      )
+    }.build()
+  }
 }
 
 /** Creates a [LessonThumbnail] from a classroomJsonObject. */
diff --git a/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationDataController.kt b/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationDataController.kt
index ed67d15d300..2cd658000a2 100644
--- a/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationDataController.kt
+++ b/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationDataController.kt
@@ -73,12 +73,14 @@ class ExplorationDataController @Inject constructor(
    */
   fun startPlayingNewExploration(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String
   ): DataProvider<Any?> {
     return startPlayingExploration(
       internalProfileId,
+      classroomId,
       topicId,
       storyId,
       explorationId,
@@ -102,6 +104,7 @@ class ExplorationDataController @Inject constructor(
    */
   fun resumeExploration(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -109,6 +112,7 @@ class ExplorationDataController @Inject constructor(
   ): DataProvider<Any?> {
     return startPlayingExploration(
       internalProfileId,
+      classroomId,
       topicId,
       storyId,
       explorationId,
@@ -131,12 +135,14 @@ class ExplorationDataController @Inject constructor(
    */
   fun restartExploration(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String
   ): DataProvider<Any?> {
     return startPlayingExploration(
       internalProfileId,
+      classroomId,
       topicId,
       storyId,
       explorationId,
@@ -162,12 +168,14 @@ class ExplorationDataController @Inject constructor(
    */
   fun replayExploration(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String
   ): DataProvider<Any?> {
     return startPlayingExploration(
       internalProfileId,
+      classroomId,
       topicId,
       storyId,
       explorationId,
@@ -206,6 +214,7 @@ class ExplorationDataController @Inject constructor(
    */
   private fun startPlayingExploration(
     internalProfileId: Int,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -215,6 +224,7 @@ class ExplorationDataController @Inject constructor(
   ): DataProvider<Any?> {
     return explorationProgressController.beginExplorationAsync(
       ProfileId.newBuilder().apply { internalId = internalProfileId }.build(),
+      classroomId,
       topicId,
       storyId,
       explorationId,
diff --git a/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgress.kt b/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgress.kt
index c897ebd7174..b71aaa4b178 100644
--- a/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgress.kt
+++ b/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgress.kt
@@ -19,6 +19,7 @@ private const val TERMINAL_INTERACTION_ID = "EndExploration"
  */
 internal class ExplorationProgress {
   internal lateinit var currentProfileId: ProfileId
+  internal lateinit var currentClassroomId: String
   internal lateinit var currentTopicId: String
   internal lateinit var currentStoryId: String
   internal lateinit var currentExplorationId: String
diff --git a/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgressController.kt b/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgressController.kt
index 3c9ef56020a..67cc9250aad 100644
--- a/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgressController.kt
+++ b/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgressController.kt
@@ -152,6 +152,7 @@ class ExplorationProgressController @Inject constructor(
    */
   internal fun beginExplorationAsync(
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -169,6 +170,7 @@ class ExplorationProgressController @Inject constructor(
     val message =
       ControllerMessage.InitializeController(
         profileId,
+        classroomId,
         topicId,
         storyId,
         explorationId,
@@ -501,6 +503,7 @@ class ExplorationProgressController @Inject constructor(
                   it.beginExplorationImpl(
                     message.callbackFlow,
                     message.profileId,
+                    message.classroomId,
                     message.topicId,
                     message.storyId,
                     message.explorationId,
@@ -588,6 +591,7 @@ class ExplorationProgressController @Inject constructor(
   private suspend fun ControllerState.beginExplorationImpl(
     beginExplorationResultFlow: MutableStateFlow<AsyncResult<Any?>>,
     profileId: ProfileId,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -601,6 +605,7 @@ class ExplorationProgressController @Inject constructor(
 
       explorationProgress.apply {
         currentProfileId = profileId
+        currentClassroomId = classroomId
         currentTopicId = topicId
         currentStoryId = storyId
         currentExplorationId = explorationId
@@ -995,6 +1000,10 @@ class ExplorationProgressController @Inject constructor(
       val state = progress.stateDeck.getCurrentState()
       hintHandler.startWatchingForHintsInNewState(state)
       startState(logStartCard = true)
+
+      if (!isRestart) {
+        explorationAnalyticsLogger.logStartExploration()
+      }
     }
 
     // Advance the stage, but do not notify observers since the current state can be reported
@@ -1255,6 +1264,7 @@ class ExplorationProgressController @Inject constructor(
         profileId,
         learnerId,
         exploration,
+        explorationProgress.currentClassroomId,
         explorationProgress.currentTopicId,
         explorationProgress.currentStoryId
       )
@@ -1364,6 +1374,7 @@ class ExplorationProgressController @Inject constructor(
     /** [ControllerMessage] for initializing a new play session. */
     data class InitializeController(
       val profileId: ProfileId,
+      val classroomId: String,
       val topicId: String,
       val storyId: String,
       val explorationId: String,
diff --git a/domain/src/main/java/org/oppia/android/domain/oppialogger/OppiaLogger.kt b/domain/src/main/java/org/oppia/android/domain/oppialogger/OppiaLogger.kt
index 41cb11d6883..7a791ebc7cc 100644
--- a/domain/src/main/java/org/oppia/android/domain/oppialogger/OppiaLogger.kt
+++ b/domain/src/main/java/org/oppia/android/domain/oppialogger/OppiaLogger.kt
@@ -86,6 +86,7 @@ class OppiaLogger @Inject constructor(private val consoleLogger: ConsoleLogger)
 
   /** Returns the context of the event indicating that the user opened the exploration activity. */
   fun createOpenExplorationActivityContext(
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String
@@ -93,6 +94,7 @@ class OppiaLogger @Inject constructor(private val consoleLogger: ConsoleLogger)
     return EventLog.Context.newBuilder()
       .setOpenExplorationActivity(
         EventLog.ExplorationContext.newBuilder()
+          .setClassroomId(classroomId)
           .setTopicId(topicId)
           .setStoryId(storyId)
           .setExplorationId(explorationId)
diff --git a/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/FeatureFlagsLogger.kt b/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/FeatureFlagsLogger.kt
index 1175075751e..f6983f25aee 100644
--- a/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/FeatureFlagsLogger.kt
+++ b/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/FeatureFlagsLogger.kt
@@ -6,6 +6,7 @@ import org.oppia.android.app.model.EventLog.FeatureFlagListContext
 import org.oppia.android.util.platformparameter.APP_AND_OS_DEPRECATION
 import org.oppia.android.util.platformparameter.DOWNLOADS_SUPPORT
 import org.oppia.android.util.platformparameter.EDIT_ACCOUNTS_OPTIONS_UI
+import org.oppia.android.util.platformparameter.ENABLE_MULTIPLE_CLASSROOMS
 import org.oppia.android.util.platformparameter.ENABLE_NPS_SURVEY
 import org.oppia.android.util.platformparameter.ENABLE_ONBOARDING_FLOW_V2
 import org.oppia.android.util.platformparameter.ENABLE_PERFORMANCE_METRICS_COLLECTION
@@ -18,6 +19,7 @@ import org.oppia.android.util.platformparameter.EnableFastLanguageSwitchingInLes
 import org.oppia.android.util.platformparameter.EnableInteractionConfigChangeStateRetention
 import org.oppia.android.util.platformparameter.EnableLearnerStudyAnalytics
 import org.oppia.android.util.platformparameter.EnableLoggingLearnerStudyIds
+import org.oppia.android.util.platformparameter.EnableMultipleClassrooms
 import org.oppia.android.util.platformparameter.EnableNpsSurvey
 import org.oppia.android.util.platformparameter.EnableOnboardingFlowV2
 import org.oppia.android.util.platformparameter.EnablePerformanceMetricsCollection
@@ -64,7 +66,9 @@ class FeatureFlagsLogger @Inject constructor(
   @EnableNpsSurvey
   private val enableNpsSurvey: PlatformParameterValue<Boolean>,
   @EnableOnboardingFlowV2
-  private val enableOnboardingFlowV2: PlatformParameterValue<Boolean>
+  private val enableOnboardingFlowV2: PlatformParameterValue<Boolean>,
+  @EnableMultipleClassrooms
+  private val enableMultipleClassrooms: PlatformParameterValue<Boolean>,
 ) {
   /**
    * A variable containing a list of all the feature flags in the app.
@@ -83,7 +87,8 @@ class FeatureFlagsLogger @Inject constructor(
     INTERACTION_CONFIG_CHANGE_STATE_RETENTION to enableInteractionConfigChangeStateRetention,
     APP_AND_OS_DEPRECATION to enableAppAndOsDeprecation,
     ENABLE_NPS_SURVEY to enableNpsSurvey,
-    ENABLE_ONBOARDING_FLOW_V2 to enableOnboardingFlowV2
+    ENABLE_ONBOARDING_FLOW_V2 to enableOnboardingFlowV2,
+    ENABLE_MULTIPLE_CLASSROOMS to enableMultipleClassrooms,
   )
 
   /**
diff --git a/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/LearnerAnalyticsLogger.kt b/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/LearnerAnalyticsLogger.kt
index 99511b001ed..2beb41852ee 100644
--- a/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/LearnerAnalyticsLogger.kt
+++ b/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/LearnerAnalyticsLogger.kt
@@ -75,6 +75,7 @@ class LearnerAnalyticsLogger @Inject constructor(
     profileId: ProfileId,
     learnerId: String?,
     exploration: Exploration,
+    classroomId: String,
     topicId: String,
     storyId: String
   ): ExplorationAnalyticsLogger {
@@ -82,6 +83,7 @@ class LearnerAnalyticsLogger @Inject constructor(
       installationId,
       profileId,
       learnerId,
+      classroomId,
       topicId,
       storyId,
       exploration.id,
@@ -185,6 +187,7 @@ class LearnerAnalyticsLogger @Inject constructor(
     installationId: String?,
     profileId: ProfileId,
     learnerId: String?,
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -213,6 +216,7 @@ class LearnerAnalyticsLogger @Inject constructor(
         ExplorationContext.newBuilder().apply {
           sessionId = learnerSessionId
           this.explorationId = explorationId
+          this.classroomId = classroomId
           this.topicId = topicId
           this.storyId = storyId
           this.explorationVersion = explorationVersion
@@ -235,6 +239,11 @@ class LearnerAnalyticsLogger @Inject constructor(
       }
     }
 
+    /** Logs that an exploration has been started by the learner. */
+    fun logStartExploration() {
+      getExpectedStateLogger()?.logStartExploration()
+    }
+
     /** Logs that the current exploration has been exited (i.e. not finished). */
     fun logExitExploration() {
       getExpectedStateLogger()?.logExitExploration()
@@ -321,6 +330,11 @@ class LearnerAnalyticsLogger @Inject constructor(
   ) {
     private val linkedSkillId by lazy { currentState.linkedSkillId }
 
+    /** Logs that an exploration has been started (at this state). */
+    internal fun logStartExploration() {
+      logStateEvent(EventBuilder::setStartExplorationContext)
+    }
+
     /** Logs that the current exploration has been exited (at this state). */
     internal fun logExitExploration() {
       logStateEvent(EventBuilder::setExitExplorationContext)
diff --git a/domain/src/main/java/org/oppia/android/domain/topic/TopicController.kt b/domain/src/main/java/org/oppia/android/domain/topic/TopicController.kt
index f893e87a4b2..d561ccff816 100755
--- a/domain/src/main/java/org/oppia/android/domain/topic/TopicController.kt
+++ b/domain/src/main/java/org/oppia/android/domain/topic/TopicController.kt
@@ -30,6 +30,7 @@ import org.oppia.android.app.model.Topic
 import org.oppia.android.app.model.TopicPlayAvailability
 import org.oppia.android.app.model.TopicProgress
 import org.oppia.android.app.model.TopicRecord
+import org.oppia.android.domain.classroom.ClassroomController
 import org.oppia.android.domain.question.QuestionRetriever
 import org.oppia.android.domain.translation.TranslationController
 import org.oppia.android.domain.util.JsonAssetRetriever
@@ -105,7 +106,8 @@ class TopicController @Inject constructor(
   private val storyProgressController: StoryProgressController,
   private val assetRepository: AssetRepository,
   @LoadLessonProtosFromAssets private val loadLessonProtosFromAssets: Boolean,
-  private val translationController: TranslationController
+  private val translationController: TranslationController,
+  private val classroomController: ClassroomController,
 ) {
 
   /**
@@ -392,6 +394,7 @@ class TopicController @Inject constructor(
           .setStoryWrittenTranslationContext(storyTranslationContext)
           .setTopicWrittenTranslationContext(topicTranslationContext)
           .setStoryTitle(storySummary.storyTitle)
+          .setClassroomId(topic.classroomId)
           .setTopicId(topic.topicId)
           .setTopicTitle(topic.title)
           .setLessonThumbnail(storySummary.storyThumbnail)
@@ -558,11 +561,13 @@ class TopicController @Inject constructor(
       contentId = "description"
       html = topicData.getStringFromObject("topic_description")
     }.build()
+    val classroomId = classroomController.getClassroomIdByTopicId(topicId)
     // No written translations are included since none are retrieved from JSON.
     return Topic.newBuilder()
       .setTopicId(topicId)
       .setTitle(topicTitle)
       .setDescription(topicDescription)
+      .setClassroomId(classroomId)
       .addAllStory(storySummaryList)
       .setTopicThumbnail(createTopicThumbnailFromJson(topicData))
       .setDiskSizeBytes(computeTopicSizeBytes(getJsonAssetFileNameList(topicId)).toLong())
diff --git a/domain/src/test/java/org/oppia/android/domain/audio/AudioPlayerControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/audio/AudioPlayerControllerTest.kt
index 3f7a3d6b241..ee63c50d628 100644
--- a/domain/src/test/java/org/oppia/android/domain/audio/AudioPlayerControllerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/audio/AudioPlayerControllerTest.kt
@@ -505,7 +505,12 @@ class AudioPlayerControllerTest {
     val explorationId = TEST_EXPLORATION_ID_5
     arrangeMediaPlayer(contentId = "test_content_id")
     logIntoAnalyticsReadyAdminProfile()
-    beginExploration(topicId = "test_topic_id", storyId = "test_story_id", explorationId)
+    beginExploration(
+      classroomId = "test_classroom_id",
+      topicId = "test_topic_id",
+      storyId = "test_story_id",
+      explorationId
+    )
 
     audioPlayerController.play(isPlayingFromAutoPlay = true, reloadingMainContent = false)
     testCoroutineDispatchers.runCurrent()
@@ -538,7 +543,12 @@ class AudioPlayerControllerTest {
     val explorationId = TEST_EXPLORATION_ID_5
     arrangeMediaPlayer(contentId = "test_content_id")
     logIntoAnalyticsReadyAdminProfile()
-    beginExploration(topicId = "test_topic_id", storyId = "test_story_id", explorationId)
+    beginExploration(
+      classroomId = "test_classroom_id",
+      topicId = "test_topic_id",
+      storyId = "test_story_id",
+      explorationId
+    )
 
     audioPlayerController.play(isPlayingFromAutoPlay = false, reloadingMainContent = true)
     testCoroutineDispatchers.runCurrent()
@@ -571,7 +581,12 @@ class AudioPlayerControllerTest {
     val explorationId = TEST_EXPLORATION_ID_5
     arrangeMediaPlayer(contentId = "test_content_id", languageCode = "sw")
     logIntoAnalyticsReadyAdminProfile()
-    beginExploration(topicId = "test_topic_id", storyId = "test_story_id", explorationId)
+    beginExploration(
+      classroomId = "test_classroom_id",
+      topicId = "test_topic_id",
+      storyId = "test_story_id",
+      explorationId
+    )
 
     audioPlayerController.play(isPlayingFromAutoPlay = false, reloadingMainContent = false)
     testCoroutineDispatchers.runCurrent()
@@ -604,7 +619,12 @@ class AudioPlayerControllerTest {
     val explorationId = TEST_EXPLORATION_ID_5
     arrangeMediaPlayer(contentId = null)
     logIntoAnalyticsReadyAdminProfile()
-    beginExploration(topicId = "test_topic_id", storyId = "test_story_id", explorationId)
+    beginExploration(
+      classroomId = "test_classroom_id",
+      topicId = "test_topic_id",
+      storyId = "test_story_id",
+      explorationId
+    )
 
     audioPlayerController.play(isPlayingFromAutoPlay = false, reloadingMainContent = false)
     testCoroutineDispatchers.runCurrent()
@@ -634,7 +654,12 @@ class AudioPlayerControllerTest {
     val explorationId = TEST_EXPLORATION_ID_5
     arrangeMediaPlayer(contentId = "test_content_id", languageCode = "sw")
     logIntoAnalyticsReadyAdminProfile()
-    beginExploration(topicId = "test_topic_id", storyId = "test_story_id", explorationId)
+    beginExploration(
+      classroomId = "test_classroom_id",
+      topicId = "test_topic_id",
+      storyId = "test_story_id",
+      explorationId
+    )
     audioPlayerController.play(isPlayingFromAutoPlay = false, reloadingMainContent = false)
     testCoroutineDispatchers.runCurrent()
 
@@ -669,7 +694,12 @@ class AudioPlayerControllerTest {
     val explorationId = TEST_EXPLORATION_ID_5
     arrangeMediaPlayer(contentId = null)
     logIntoAnalyticsReadyAdminProfile()
-    beginExploration(topicId = "test_topic_id", storyId = "test_story_id", explorationId)
+    beginExploration(
+      classroomId = "test_classroom_id",
+      topicId = "test_topic_id",
+      storyId = "test_story_id",
+      explorationId
+    )
     audioPlayerController.play(isPlayingFromAutoPlay = false, reloadingMainContent = false)
     testCoroutineDispatchers.runCurrent()
 
@@ -704,7 +734,12 @@ class AudioPlayerControllerTest {
     val explorationId = TEST_EXPLORATION_ID_5
     arrangeMediaPlayer(contentId = "test_content_id", languageCode = "sw")
     logIntoAnalyticsReadyAdminProfile()
-    beginExploration(topicId = "test_topic_id", storyId = "test_story_id", explorationId)
+    beginExploration(
+      classroomId = "test_classroom_id",
+      topicId = "test_topic_id",
+      storyId = "test_story_id",
+      explorationId
+    )
     audioPlayerController.play(isPlayingFromAutoPlay = false, reloadingMainContent = false)
     testCoroutineDispatchers.runCurrent()
     fakeAnalyticsEventLogger.clearAllEvents() // Remove unrelated events.
@@ -723,7 +758,12 @@ class AudioPlayerControllerTest {
     val explorationId = TEST_EXPLORATION_ID_5
     arrangeMediaPlayer(contentId = "test_content_id", languageCode = "sw")
     logIntoAnalyticsReadyAdminProfile()
-    beginExploration(topicId = "test_topic_id", storyId = "test_story_id", explorationId)
+    beginExploration(
+      classroomId = "test_classroom_id",
+      topicId = "test_topic_id",
+      storyId = "test_story_id",
+      explorationId
+    )
     testCoroutineDispatchers.runCurrent()
     fakeAnalyticsEventLogger.clearAllEvents() // Remove unrelated events.
 
@@ -740,7 +780,12 @@ class AudioPlayerControllerTest {
     val explorationId = TEST_EXPLORATION_ID_5
     arrangeMediaPlayer(contentId = "test_content_id", languageCode = "sw")
     logIntoAnalyticsReadyAdminProfile()
-    beginExploration(topicId = "test_topic_id", storyId = "test_story_id", explorationId)
+    beginExploration(
+      classroomId = "test_classroom_id",
+      topicId = "test_topic_id",
+      storyId = "test_story_id",
+      explorationId
+    )
     testCoroutineDispatchers.runCurrent()
     fakeAnalyticsEventLogger.clearAllEvents() // Remove unrelated events.
 
@@ -791,10 +836,15 @@ class AudioPlayerControllerTest {
     )
   }
 
-  private fun beginExploration(topicId: String, storyId: String, explorationId: String) {
+  private fun beginExploration(
+    classroomId: String,
+    topicId: String,
+    storyId: String,
+    explorationId: String
+  ) {
     val playingProvider =
       explorationDataController.startPlayingNewExploration(
-        internalProfileId = 0, topicId, storyId, explorationId
+        internalProfileId = 0, classroomId, topicId, storyId, explorationId
       )
     monitorFactory.waitForNextSuccessfulResult(playingProvider)
     monitorFactory.waitForNextSuccessfulResult(explorationProgressController.getCurrentState())
diff --git a/domain/src/test/java/org/oppia/android/domain/classroom/ClassroomControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/classroom/ClassroomControllerTest.kt
index 9ff4b0f29fc..24129abc307 100644
--- a/domain/src/test/java/org/oppia/android/domain/classroom/ClassroomControllerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/classroom/ClassroomControllerTest.kt
@@ -252,6 +252,48 @@ class ClassroomControllerTest {
     assertThat(topicIds).doesNotContain(TEST_TOPIC_ID_2)
   }
 
+  @Test
+  fun testGetClassroomIdByTopicId_testTopic0_returnsCorrectClassroomId() {
+    val classroomId = classroomController.getClassroomIdByTopicId(TEST_TOPIC_ID_0)
+
+    assertThat(classroomId).isEqualTo(TEST_CLASSROOM_ID_0)
+  }
+
+  @Test
+  fun testGetClassroomIdByTopicId_testTopic1_returnsCorrectClassroomId() {
+    val classroomId = classroomController.getClassroomIdByTopicId(TEST_TOPIC_ID_1)
+
+    assertThat(classroomId).isEqualTo(TEST_CLASSROOM_ID_0)
+  }
+
+  @Test
+  fun testGetClassroomIdByTopicId_fractionsTopic_returnsCorrectClassroomId() {
+    val classroomId = classroomController.getClassroomIdByTopicId(FRACTIONS_TOPIC_ID)
+
+    assertThat(classroomId).isEqualTo(TEST_CLASSROOM_ID_1)
+  }
+
+  @Test
+  fun testGetClassroomIdByTopicId_ratiosTopic_returnsCorrectClassroomId() {
+    val classroomId = classroomController.getClassroomIdByTopicId(RATIOS_TOPIC_ID)
+
+    assertThat(classroomId).isEqualTo(TEST_CLASSROOM_ID_1)
+  }
+
+  @Test
+  fun testGetClassroomIdByTopicId_testTopic2_returnsCorrectClassroomId() {
+    val classroomId = classroomController.getClassroomIdByTopicId(TEST_TOPIC_ID_2)
+
+    assertThat(classroomId).isEqualTo(TEST_CLASSROOM_ID_2)
+  }
+
+  @Test
+  fun testGetClassroomIdByTopicId_nonExistentTopic_returnsEmptyId() {
+    val classroomId = classroomController.getClassroomIdByTopicId("invalid_topic_id")
+
+    assertThat(classroomId).isEmpty()
+  }
+
   private fun getClassroomList(profileId: ProfileId) =
     monitorFactory.waitForNextSuccessfulResult(classroomController.getClassroomList(profileId))
 
diff --git a/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationActiveTimeControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationActiveTimeControllerTest.kt
index 7f33cbe96ab..5de6ae1179c 100644
--- a/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationActiveTimeControllerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationActiveTimeControllerTest.kt
@@ -27,6 +27,7 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_0
 import org.oppia.android.domain.exploration.testing.ExplorationStorageTestModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionProdModule
@@ -109,7 +110,11 @@ class ExplorationActiveTimeControllerTest {
 
     applicationLifecycleObserver.onAppInForeground()
     startPlayingNewExploration(
-      TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, firstTestProfile
+      TEST_CLASSROOM_ID_0,
+      TEST_TOPIC_ID_0,
+      TEST_STORY_ID_0,
+      TEST_EXPLORATION_ID_2,
+      firstTestProfile
     )
 
     testCoroutineDispatchers.advanceTimeBy(SESSION_LENGTH_1)
@@ -131,7 +136,11 @@ class ExplorationActiveTimeControllerTest {
 
     applicationLifecycleObserver.onAppInForeground()
     startPlayingNewExploration(
-      TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, firstTestProfile
+      TEST_CLASSROOM_ID_0,
+      TEST_TOPIC_ID_0,
+      TEST_STORY_ID_0,
+      TEST_EXPLORATION_ID_2,
+      firstTestProfile
     )
 
     testCoroutineDispatchers.advanceTimeBy(SESSION_LENGTH_1)
@@ -153,7 +162,11 @@ class ExplorationActiveTimeControllerTest {
 
     explorationActiveTimeController.onAppInForeground()
     startPlayingNewExploration(
-      TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, firstTestProfile
+      TEST_CLASSROOM_ID_0,
+      TEST_TOPIC_ID_0,
+      TEST_STORY_ID_0,
+      TEST_EXPLORATION_ID_2,
+      firstTestProfile
     )
 
     testCoroutineDispatchers.advanceTimeBy(SESSION_LENGTH_1)
@@ -206,7 +219,11 @@ class ExplorationActiveTimeControllerTest {
 
     applicationLifecycleObserver.onAppInForeground()
     startPlayingNewExploration(
-      TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, firstTestProfile
+      TEST_CLASSROOM_ID_0,
+      TEST_TOPIC_ID_0,
+      TEST_STORY_ID_0,
+      TEST_EXPLORATION_ID_2,
+      firstTestProfile
     )
 
     testCoroutineDispatchers.advanceTimeBy(SESSION_LENGTH_1)
@@ -262,6 +279,7 @@ class ExplorationActiveTimeControllerTest {
 
     explorationActiveTimeController.onAppInForeground()
     startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0,
       TEST_TOPIC_ID_0,
       TEST_STORY_ID_0,
       TEST_EXPLORATION_ID_2,
@@ -308,6 +326,7 @@ class ExplorationActiveTimeControllerTest {
     testCoroutineDispatchers.advanceTimeBy(TimeUnit.DAYS.toMillis(1))
 
     startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0,
       TEST_TOPIC_ID_0,
       TEST_STORY_ID_0,
       TEST_EXPLORATION_ID_2,
@@ -353,6 +372,7 @@ class ExplorationActiveTimeControllerTest {
     applicationLifecycleObserver.onAppInForeground()
 
     startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0,
       TEST_TOPIC_ID_0,
       TEST_STORY_ID_0,
       TEST_EXPLORATION_ID_2,
@@ -380,6 +400,7 @@ class ExplorationActiveTimeControllerTest {
     applicationLifecycleObserver.onAppInForeground()
 
     startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0,
       TEST_TOPIC_ID_0,
       TEST_STORY_ID_0,
       TEST_EXPLORATION_ID_2,
@@ -389,6 +410,7 @@ class ExplorationActiveTimeControllerTest {
     stopExploration()
 
     startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0,
       TEST_TOPIC_ID_1,
       TEST_STORY_ID_0,
       TEST_EXPLORATION_ID_2,
@@ -423,6 +445,7 @@ class ExplorationActiveTimeControllerTest {
     applicationLifecycleObserver.onAppInForeground()
 
     startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0,
       TEST_TOPIC_ID_0,
       TEST_STORY_ID_0,
       TEST_EXPLORATION_ID_2,
@@ -432,6 +455,7 @@ class ExplorationActiveTimeControllerTest {
     stopExploration()
 
     startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0,
       TEST_TOPIC_ID_0,
       TEST_STORY_ID_0,
       TEST_EXPLORATION_ID_2,
@@ -460,6 +484,7 @@ class ExplorationActiveTimeControllerTest {
   }
 
   private fun startPlayingNewExploration(
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -467,7 +492,7 @@ class ExplorationActiveTimeControllerTest {
   ) {
     val startPlayingProvider =
       explorationDataController.startPlayingNewExploration(
-        profileId.internalId, topicId, storyId, explorationId
+        profileId.internalId, classroomId, topicId, storyId, explorationId
       )
     monitorFactory.waitForNextSuccessfulResult(startPlayingProvider)
   }
diff --git a/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationDataControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationDataControllerTest.kt
index 330ae280b21..9e6e7e78b5e 100644
--- a/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationDataControllerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationDataControllerTest.kt
@@ -28,6 +28,7 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_0
 import org.oppia.android.domain.exploration.lightweightcheckpointing.ExplorationCheckpointController
 import org.oppia.android.domain.exploration.testing.ExplorationStorageTestModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigModule
@@ -187,7 +188,11 @@ class ExplorationDataControllerTest {
   fun testStartPlayingNewExploration_returnsSuccess() {
     val startProvider =
       explorationDataController.startPlayingNewExploration(
-        profileId.internalId, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+        profileId.internalId,
+        TEST_CLASSROOM_ID_0,
+        TEST_TOPIC_ID_0,
+        TEST_STORY_ID_0,
+        TEST_EXPLORATION_ID_2
       )
 
     monitorFactory.waitForNextSuccessfulResult(startProvider)
@@ -195,12 +200,20 @@ class ExplorationDataControllerTest {
 
   @Test
   fun testStartPlayingNewExploration_afterCompletingIt_returnsSuccess() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0,
+      TEST_TOPIC_ID_0,
+      TEST_STORY_ID_0,
+      TEST_EXPLORATION_ID_2
+    )
     stopExploration()
 
     val secondStartProvider =
       explorationDataController.startPlayingNewExploration(
-        profileId.internalId, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+        profileId.internalId,
+        TEST_CLASSROOM_ID_0,
+        TEST_TOPIC_ID_0, TEST_STORY_ID_0,
+        TEST_EXPLORATION_ID_2
       )
 
     monitorFactory.waitForNextSuccessfulResult(secondStartProvider)
@@ -208,13 +221,23 @@ class ExplorationDataControllerTest {
 
   @Test
   fun testResumeExploration_afterStartingIt_returnsSuccess() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0,
+      TEST_TOPIC_ID_0,
+      TEST_STORY_ID_0,
+      TEST_EXPLORATION_ID_2
+    )
     stopExploration(isCompletion = false)
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
     val secondStartProvider =
       explorationDataController.resumeExploration(
-        profileId.internalId, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+        profileId.internalId,
+        TEST_CLASSROOM_ID_0,
+        TEST_TOPIC_ID_0,
+        TEST_STORY_ID_0,
+        TEST_EXPLORATION_ID_2,
+        checkpoint
       )
 
     monitorFactory.waitForNextSuccessfulResult(secondStartProvider)
@@ -224,7 +247,11 @@ class ExplorationDataControllerTest {
   fun testRestartExploration_returnsSuccess() {
     val startProvider =
       explorationDataController.restartExploration(
-        profileId.internalId, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+        profileId.internalId,
+        TEST_CLASSROOM_ID_0,
+        TEST_TOPIC_ID_0,
+        TEST_STORY_ID_0,
+        TEST_EXPLORATION_ID_2
       )
 
     monitorFactory.waitForNextSuccessfulResult(startProvider)
@@ -232,12 +259,21 @@ class ExplorationDataControllerTest {
 
   @Test
   fun testRestartExploration_afterStartingIt_returnsSuccess() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0,
+      TEST_TOPIC_ID_0,
+      TEST_STORY_ID_0,
+      TEST_EXPLORATION_ID_2
+    )
     stopExploration(isCompletion = false)
 
     val secondStartProvider =
       explorationDataController.restartExploration(
-        profileId.internalId, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+        profileId.internalId,
+        TEST_CLASSROOM_ID_0,
+        TEST_TOPIC_ID_0,
+        TEST_STORY_ID_0,
+        TEST_EXPLORATION_ID_2
       )
 
     monitorFactory.waitForNextSuccessfulResult(secondStartProvider)
@@ -247,7 +283,11 @@ class ExplorationDataControllerTest {
   fun testReplayExploration_returnsSuccess() {
     val startProvider =
       explorationDataController.replayExploration(
-        profileId.internalId, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+        profileId.internalId,
+        TEST_CLASSROOM_ID_0,
+        TEST_TOPIC_ID_0,
+        TEST_STORY_ID_0,
+        TEST_EXPLORATION_ID_2
       )
 
     monitorFactory.waitForNextSuccessfulResult(startProvider)
@@ -255,12 +295,21 @@ class ExplorationDataControllerTest {
 
   @Test
   fun testReplayExploration_afterCompletingIt_returnsSuccess() {
-    replayExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    replayExploration(
+      TEST_CLASSROOM_ID_0,
+      TEST_TOPIC_ID_0,
+      TEST_STORY_ID_0,
+      TEST_EXPLORATION_ID_2
+    )
     stopExploration()
 
     val secondStartProvider =
       explorationDataController.replayExploration(
-        profileId.internalId, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+        profileId.internalId,
+        TEST_CLASSROOM_ID_0,
+        TEST_TOPIC_ID_0,
+        TEST_STORY_ID_0,
+        TEST_EXPLORATION_ID_2
       )
 
     monitorFactory.waitForNextSuccessfulResult(secondStartProvider)
@@ -268,11 +317,20 @@ class ExplorationDataControllerTest {
 
   @Test
   fun testReplayExploration_withoutStoppingPreviousSession_returnsSuccess() {
-    replayExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    replayExploration(
+      TEST_CLASSROOM_ID_0,
+      TEST_TOPIC_ID_0,
+      TEST_STORY_ID_0,
+      TEST_EXPLORATION_ID_2
+    )
 
     val dataProvider =
       explorationDataController.replayExploration(
-        profileId.internalId, TEST_TOPIC_ID_1, TEST_STORY_ID_2, TEST_EXPLORATION_ID_4
+        profileId.internalId,
+        TEST_CLASSROOM_ID_0,
+        TEST_TOPIC_ID_1,
+        TEST_STORY_ID_2,
+        TEST_EXPLORATION_ID_4
       )
 
     // The new session overwrites the previous.
@@ -290,7 +348,12 @@ class ExplorationDataControllerTest {
 
   @Test
   fun testStopPlayingExploration_afterStarting_notCompletion_returnsSuccess() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0,
+      TEST_TOPIC_ID_0,
+      TEST_STORY_ID_0,
+      TEST_EXPLORATION_ID_2
+    )
 
     val resultProvider = explorationDataController.stopPlayingExploration(isCompletion = false)
 
@@ -299,7 +362,12 @@ class ExplorationDataControllerTest {
 
   @Test
   fun testStopPlayingExploration_afterStarting_completion_returnsSuccess() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0,
+      TEST_TOPIC_ID_0,
+      TEST_STORY_ID_0,
+      TEST_EXPLORATION_ID_2
+    )
 
     val resultProvider = explorationDataController.stopPlayingExploration(isCompletion = true)
 
@@ -310,26 +378,41 @@ class ExplorationDataControllerTest {
     ApplicationProvider.getApplicationContext<TestApplication>().inject(this)
   }
 
-  private fun startPlayingNewExploration(topicId: String, storyId: String, explorationId: String) {
+  private fun startPlayingNewExploration(
+    classroomId: String,
+    topicId: String,
+    storyId: String,
+    explorationId: String
+  ) {
     val startPlayingProvider =
       explorationDataController.startPlayingNewExploration(
-        profileId.internalId, topicId, storyId, explorationId
+        profileId.internalId, classroomId, topicId, storyId, explorationId
       )
     monitorFactory.waitForNextSuccessfulResult(startPlayingProvider)
   }
 
-  private fun restartExploration(topicId: String, storyId: String, explorationId: String) {
+  private fun restartExploration(
+    classroomId: String,
+    topicId: String,
+    storyId: String,
+    explorationId: String
+  ) {
     val startPlayingProvider =
       explorationDataController.restartExploration(
-        profileId.internalId, topicId, storyId, explorationId
+        profileId.internalId, classroomId, topicId, storyId, explorationId
       )
     monitorFactory.waitForNextSuccessfulResult(startPlayingProvider)
   }
 
-  private fun replayExploration(topicId: String, storyId: String, explorationId: String) {
+  private fun replayExploration(
+    classroomId: String,
+    topicId: String,
+    storyId: String,
+    explorationId: String
+  ) {
     val startPlayingProvider =
       explorationDataController.replayExploration(
-        profileId.internalId, topicId, storyId, explorationId
+        profileId.internalId, classroomId, topicId, storyId, explorationId
       )
     monitorFactory.waitForNextSuccessfulResult(startPlayingProvider)
   }
diff --git a/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationProgressControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationProgressControllerTest.kt
index 97f81c0f3af..3026b834567 100644
--- a/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationProgressControllerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationProgressControllerTest.kt
@@ -26,6 +26,7 @@ import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.PROGRESS
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.REACH_INVESTED_ENGAGEMENT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.RESUME_LESSON_SUBMIT_CORRECT_ANSWER_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.RESUME_LESSON_SUBMIT_INCORRECT_ANSWER_CONTEXT
+import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.START_EXPLORATION_CONTEXT
 import org.oppia.android.app.model.Exploration
 import org.oppia.android.app.model.ExplorationCheckpoint
 import org.oppia.android.app.model.Fraction
@@ -59,6 +60,8 @@ import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExp
 import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule
 import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule
 import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_0
+import org.oppia.android.domain.classroom.TEST_CLASSROOM_ID_1
 import org.oppia.android.domain.exploration.lightweightcheckpointing.ExplorationCheckpointController
 import org.oppia.android.domain.exploration.testing.ExplorationStorageTestModule
 import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigModule
@@ -124,6 +127,7 @@ import javax.inject.Singleton
 // For context:
 // https://github.com/oppia/oppia/blob/37285a/extensions/interactions/Continue/directives/oppia-interactive-continue.directive.ts.
 private const val DEFAULT_CONTINUE_INTERACTION_TEXT_ANSWER = "Please continue."
+private const val INVALID_CLASSROOM_ID = "invalid_classroom_id"
 private const val INVALID_TOPIC_ID = "invalid_topic_id"
 private const val INVALID_STORY_ID = "invalid_story_id"
 private const val INVALID_EXPLORATION_ID = "invalid_exp_id"
@@ -178,7 +182,11 @@ class ExplorationProgressControllerTest {
   fun testPlayExploration_invalid_returnsSuccess() {
     val resultDataProvider =
       explorationDataController.replayExploration(
-        profileId.internalId, INVALID_TOPIC_ID, INVALID_STORY_ID, INVALID_EXPLORATION_ID
+        profileId.internalId,
+        INVALID_CLASSROOM_ID,
+        INVALID_TOPIC_ID,
+        INVALID_STORY_ID,
+        INVALID_EXPLORATION_ID
       )
 
     // An invalid exploration is not known until it's fully loaded, and that's observed via
@@ -188,7 +196,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_playInvalidExploration_returnsFailure() {
-    restartExploration(INVALID_TOPIC_ID, INVALID_STORY_ID, INVALID_EXPLORATION_ID)
+    restartExploration(
+      INVALID_CLASSROOM_ID, INVALID_TOPIC_ID, INVALID_STORY_ID, INVALID_EXPLORATION_ID
+    )
 
     val error = waitForGetCurrentStateFailureLoad()
 
@@ -199,7 +209,11 @@ class ExplorationProgressControllerTest {
   fun testPlayExploration_valid_returnsSuccess() {
     val resultDataProvider =
       explorationDataController.replayExploration(
-        profileId.internalId, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+        profileId.internalId,
+        TEST_CLASSROOM_ID_0,
+        TEST_TOPIC_ID_0,
+        TEST_STORY_ID_0,
+        TEST_EXPLORATION_ID_2
       )
 
     monitorFactory.waitForNextSuccessfulResult(resultDataProvider)
@@ -207,7 +221,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_playExploration_loaded_returnsInitialStatePending() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
 
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
@@ -220,7 +236,9 @@ class ExplorationProgressControllerTest {
   fun testEphemeralState_startExploration_shouldIndicateButtonAnimation() {
     oppiaClock.setFakeTimeMode(FakeOppiaClock.FakeTimeMode.MODE_FIXED_FAKE_TIME)
     val currentTime = oppiaClock.getCurrentTimeMs()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
     assertThat(ephemeralState.showContinueButtonAnimation).isTrue()
     assertThat(ephemeralState.continueButtonAnimationTimestampMs)
@@ -229,7 +247,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testEphemeralState_moveToNextState_shouldIndicateNoButtonAnimation() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     playThroughPrototypeState1AndMoveToNextState()
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
     assertThat(ephemeralState.showContinueButtonAnimation).isFalse()
@@ -239,11 +259,15 @@ class ExplorationProgressControllerTest {
   fun testEphemeralState_profile1ClicksContinue_switchToProfile2_shouldIndicateButtonAnimation() {
     oppiaClock.setFakeTimeMode(FakeOppiaClock.FakeTimeMode.MODE_FIXED_FAKE_TIME)
     val profileId2 = ProfileId.newBuilder().setInternalId(1).build()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     playThroughPrototypeState1AndMoveToNextState()
     endExploration()
     val currentTime = oppiaClock.getCurrentTimeMs()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, profileId2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, profileId2
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
     assertThat(ephemeralState.showContinueButtonAnimation).isTrue()
     assertThat(ephemeralState.continueButtonAnimationTimestampMs)
@@ -252,11 +276,15 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testEphemeralState_startExp_clicksContinue_reEnterExp_shouldIndicateNoButtonAnimation() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     playThroughPrototypeState1AndMoveToNextState()
     val checkPoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
     endExploration()
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkPoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkPoint
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
     assertThat(ephemeralState.showContinueButtonAnimation).isFalse()
   }
@@ -264,11 +292,15 @@ class ExplorationProgressControllerTest {
   @Test
   fun testEphemeralState_startExp_seesAnimation_reEnterExploration_shouldIndicateButtonAnimation() {
     oppiaClock.setFakeTimeMode(FakeOppiaClock.FakeTimeMode.MODE_FIXED_FAKE_TIME)
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     testCoroutineDispatchers.advanceTimeBy(TimeUnit.SECONDS.toMillis(45))
     endExploration()
     val currentTime = oppiaClock.getCurrentTimeMs()
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
     assertThat(ephemeralState.showContinueButtonAnimation).isTrue()
     assertThat(ephemeralState.continueButtonAnimationTimestampMs)
@@ -278,11 +310,15 @@ class ExplorationProgressControllerTest {
   @Test
   fun testGetCurrentState_playInvalidExploration_thenPlayValidExp_returnsInitialPendingState() {
     // Start with playing an invalid exploration.
-    restartExploration(INVALID_TOPIC_ID, INVALID_STORY_ID, INVALID_EXPLORATION_ID)
+    restartExploration(
+      INVALID_CLASSROOM_ID, INVALID_TOPIC_ID, INVALID_STORY_ID, INVALID_EXPLORATION_ID
+    )
     endExploration()
 
     // Then a valid one.
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
 
     // The latest result should correspond to the valid ID, and the progress controller should
     // gracefully recover.
@@ -304,13 +340,19 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testPlayExploration_withoutFinishingPrevious_succeeds() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     // Try playing another exploration without finishing the previous one.
     val resultDataProvider =
       explorationDataController.replayExploration(
-        profileId.internalId, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+        profileId.internalId,
+        TEST_CLASSROOM_ID_0,
+        TEST_TOPIC_ID_0,
+        TEST_STORY_ID_0,
+        TEST_EXPLORATION_ID_2
       )
 
     // The new session will overwrite the previous.
@@ -320,12 +362,16 @@ class ExplorationProgressControllerTest {
   @Test
   fun testGetCurrentState_playSecondExploration_afterFinishingPrev_loaded_returnsInitialState() {
     // Start with playing a valid exploration, then stop.
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     endExploration()
 
     // Then another valid one.
-    restartExploration(TEST_TOPIC_ID_1, TEST_STORY_ID_2, TEST_EXPLORATION_ID_4)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_1, TEST_STORY_ID_2, TEST_EXPLORATION_ID_4
+    )
 
     // The latest result should correspond to the valid ID, and the progress controller should
     // gracefully recover.
@@ -347,7 +393,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testSubmitAnswer_forMultipleChoice_correctAnswer_succeeds() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     navigateToPrototypeMultipleChoiceState()
 
@@ -359,7 +407,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testSubmitAnswer_forMultipleChoice_correctAnswer_returnsOutcomeWithTransition() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     navigateToPrototypeMultipleChoiceState()
 
@@ -373,7 +423,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testSubmitAnswer_forMultipleChoice_wrongAnswer_succeeds() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     navigateToPrototypeMultipleChoiceState()
 
@@ -385,7 +437,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testSubmitAnswer_forMultipleChoice_wrongAnswer_providesDefFeedbackAndSameStateTransition() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     navigateToPrototypeMultipleChoiceState()
 
@@ -399,7 +453,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_afterSubmittingCorrectMultiChoiceAnswer_becomesCompletedState() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     navigateToPrototypeMultipleChoiceState()
 
@@ -415,7 +471,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_afterSubmittingWrongMultiChoiceAnswer_updatesPendingState() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     navigateToPrototypeMultipleChoiceState()
 
@@ -432,7 +490,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_afterSubmittingWrongThenRightAnswer_updatesToStateWithBothAnswers() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     navigateToPrototypeMultipleChoiceState()
     submitMultipleChoiceAnswer(0)
@@ -463,7 +523,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testMoveToNext_forPendingInitialState_failsWithError() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     val moveToStateResult = explorationProgressController.moveToNextState()
@@ -477,7 +539,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testMoveToNext_forCompletedState_succeeds() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     submitPrototypeState1Answer()
 
@@ -488,7 +552,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testMoveToNext_forCompletedState_movesToNextState() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     submitPrototypeState1Answer()
 
@@ -500,7 +566,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testMoveToNext_afterMovingFromCompletedState_failsWithError() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     submitPrototypeState1Answer()
     moveToNextState()
@@ -527,7 +595,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testMoveToPrevious_onPendingInitialState_failsWithError() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     val moveToStateResult = explorationProgressController.moveToPreviousState()
@@ -541,7 +611,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testMoveToPrevious_onCompletedInitialState_failsWithError() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     submitPrototypeState1Answer()
 
@@ -556,7 +628,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testMoveToPrevious_forStateWithCompletedPreviousState_succeeds() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
 
@@ -569,7 +643,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testMoveToPrevious_forCompletedState_movesToPreviousState() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
 
@@ -584,7 +660,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testMoveToPrevious_navigatedForwardThenBackToInitial_failsWithError() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     moveToPreviousState()
@@ -601,7 +679,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testSubmitAnswer_forTextInput_correctAnswer_returnsOutcomeWithTransition() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     navigateToPrototypeTextInputState()
 
@@ -615,7 +695,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testSubmitAnswer_forTextInput_wrongAnswer_returnsDefaultOutcome() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     navigateToPrototypeTextInputState()
 
@@ -630,7 +712,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testSubmitAnswer_forFractionInput_wrongAnswer_returnsDefaultOutcome_hasHint() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     navigateToPrototypeFractionInputState()
 
@@ -650,7 +734,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testRevealHint_forWrongAnswers_showHint_returnHintIsRevealed() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     navigateToPrototypeFractionInputState()
     // Submit 2 wrong answers to trigger a hint becoming available.
@@ -670,7 +756,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testRevealSolution_triggeredSolution_showSolution_returnSolutionIsRevealed() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     navigateToPrototypeFractionInputState()
     // Submit 2 wrong answers to trigger the hint.
@@ -697,7 +785,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testHintsAndSolution_noHintVisible_checkHelpIndexIsCorrect() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     val ephemeralState = playThroughPrototypeState1AndMoveToNextState()
 
@@ -709,7 +799,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testHintsAndSolution_wait60Seconds_unrevealedHintIsVisible_checkHelpIndexIsCorrect() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     // Make the first hint visible by submitting two wrong answers.
@@ -727,7 +819,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testHintsAndSolution_submitTwoWrongAnswers_unrevealedHintIsVisible_checkHelpIndexIsCorrect() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     // Make the first hint visible by submitting two wrong answers.
@@ -744,7 +838,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testHintsAndSolution_revealedHintIsVisible_checkHelpIndexIsCorrect() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     submitWrongAnswerForPrototypeState2()
@@ -765,7 +861,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testHintsAndSolution_allHintsVisible_wait30Seconds_solutionVisible_checkHelpIndexIsCorrect() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     submitWrongAnswerForPrototypeState2()
@@ -789,7 +887,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testHintAndSol_hintsVisible_submitWrongAns_wait10Second_solVisible_checkHelpIndexIsCorrect() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     submitWrongAnswerForPrototypeState2()
@@ -814,7 +914,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testHintsAndSolution_revealedSolutionIsVisible_checkHelpIndexIsCorrect() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     submitWrongAnswerForPrototypeState2()
@@ -841,7 +943,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testSubmitAnswer_forTextInput_wrongAnswer_afterAllHintsAreExhausted_showSolution() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     navigateToPrototypeFractionInputState()
 
@@ -862,7 +966,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_secondState_submitRightAnswer_pendingStateBecomesCompleted() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     navigateToPrototypeTextInputState()
 
@@ -880,7 +986,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testSubmitAnswer_forTextInput_withSpaces_updatesStateWithVerbatimAnswer() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     navigateToPrototypeTextInputState()
 
@@ -900,7 +1008,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_eighthState_submitWrongAnswer_updatePendingState() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     navigateToPrototypeTextInputState()
 
@@ -919,7 +1029,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_afterMovePreviousAndNext_returnsCurrentState() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
 
@@ -933,7 +1045,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_afterMoveNextAndPrevious_returnsCurrentState() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     submitPrototypeState2Answer() // Submit the answer but do not proceed to the next state.
@@ -948,7 +1062,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_afterMoveToPrev_onThirdState_newObserver_receivesCompletedSecondState() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     playThroughPrototypeState2AndMoveToNextState()
@@ -964,7 +1080,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_forFirstState_doesNotHaveNextState() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
     // The initial state should not have a next state.
@@ -973,7 +1091,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_forFirstState_afterAnswerSubmission_doesNotHaveNextState() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     val ephemeralState = submitPrototypeState1Answer()
@@ -985,7 +1105,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_forSecondState_doesNotHaveNextState() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     val ephemeralState = playThroughPrototypeState1AndMoveToNextState()
@@ -996,7 +1118,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_forSecondState_navigateBackward_hasNextState() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
 
@@ -1008,7 +1132,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_forSecondState_navigateBackwardThenForward_doesNotHaveNextState() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
 
@@ -1021,7 +1147,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testSubmitAnswer_forNumericInput_correctAnswer_returnsOutcomeWithTransition() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     navigateToPrototypeNumericInputState()
 
@@ -1035,7 +1163,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testSubmitAnswer_forNumericInput_wrongAnswer_returnsOutcomeWithTransition() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     navigateToPrototypeNumericInputState()
 
@@ -1049,7 +1179,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testSubmitAnswer_forContinue_returnsOutcomeWithTransition() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     // The first state of the exploration is the Continue interaction.
 
@@ -1063,7 +1195,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_eleventhState_isTerminalState() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     val ephemeralState = playThroughPrototypeExploration()
@@ -1074,7 +1208,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_afterMoveToPrevious_onThirdState_updatesToCompletedSecondState() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     playThroughPrototypeState2AndMoveToNextState()
@@ -1096,7 +1232,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testMoveToNext_onFinalState_failsWithError() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeExploration()
 
@@ -1111,7 +1249,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_afterPlayingFullSecondExploration_returnsTerminalState() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_13)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_13
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     submitImageRegionAnswer(clickX = 0.5f, clickY = 0.5f, clickedRegion = "Saturn")
@@ -1125,7 +1265,9 @@ class ExplorationProgressControllerTest {
   fun testGetCurrentState_afterPlayingFullSecondExploration_diffPath_returnsTerminalState() {
     // Click on Jupiter before Saturn to take a slightly different (valid) path through the
     // exploration. (Note that this does not include actual branching).
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_13)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_13
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     submitImageRegionAnswer(clickX = 0.2f, clickY = 0.5f, clickedRegion = "Jupiter")
@@ -1138,12 +1280,16 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_afterPlayingThroughPreviousExplorations_returnsStateFromSecondExp() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeExploration()
     endExploration()
 
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_13)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_13
+    )
     waitForGetCurrentStateSuccessfulLoad()
     val ephemeralState =
       submitImageRegionAnswer(clickX = 0.2f, clickY = 0.5f, clickedRegion = "Jupiter")
@@ -1156,7 +1302,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testMoveToPrevious_navigatedForwardThenBackToInitial_failsWithError_logsException() {
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     moveToPreviousState()
@@ -1173,7 +1321,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testGetCurrentState_playInvalidExploration_returnsFailure_logsException() {
-    restartExploration(INVALID_TOPIC_ID, INVALID_STORY_ID, INVALID_EXPLORATION_ID)
+    restartExploration(
+      INVALID_CLASSROOM_ID, INVALID_TOPIC_ID, INVALID_STORY_ID, INVALID_EXPLORATION_ID
+    )
 
     waitForGetCurrentStateFailureLoad()
 
@@ -1184,7 +1334,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_loadExploration_checkCheckpointIsSaved() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     val result =
@@ -1197,7 +1349,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_playThroughMultipleStates_verifyCheckpointHasCorrectPendingStateName() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     assertThat(retrieveCheckpointStateName(TEST_EXPLORATION_ID_2)).isEqualTo("Continue")
@@ -1214,7 +1368,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_advToFourthState_backToPrevState_verifyCheckpointHasCorrectPendingState() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
@@ -1228,7 +1384,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_backTwoStates_nextState_verifyCheckpointHasCorrectPendingState() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
@@ -1243,7 +1401,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_advanceToThirdState_submitMultipleAns_checkCheckpointIsSavedAfterEachAns() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
@@ -1271,7 +1431,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_advToThirdState_submitAns_prevState_checkCheckpointIsSavedAfterEachAns() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
@@ -1295,7 +1457,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_advToThirdState_moveToPrevState_checkCheckpointHasStateIndexOfThirdState() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
@@ -1307,7 +1471,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_advToThirdState_prevStates_nextState_checkCheckpointHasCorrectStateIndex() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
@@ -1321,7 +1487,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_hintIsVisible_checkHintIsSavedInCheckpoint() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     navigateToPrototypeFractionInputState()
@@ -1336,7 +1504,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_revealHint_checkHintIsSavedInCheckpoint() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     navigateToPrototypeFractionInputState()
@@ -1354,7 +1524,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_solutionIsVisible_checkCheckpointIsSaved() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     navigateToPrototypeFractionInputState()
@@ -1375,7 +1547,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_revealSolution_checkCheckpointIsSaved() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     navigateToPrototypeFractionInputState()
@@ -1399,7 +1573,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_onStateWithContinueInteraction_pressContinue_correctCheckpointIsSaved() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
@@ -1412,7 +1588,9 @@ class ExplorationProgressControllerTest {
   fun testCheckpointing_noCheckpointSaved_checkCheckpointStateIsUnsaved() {
     // 'Replay' the exploration (since the only way to not have saved progress is for the lesson to
     // already be completed).
-    replayExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    replayExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
     assertThat(ephemeralState.checkpointState).isEqualTo(CheckpointState.CHECKPOINT_UNSAVED)
@@ -1420,7 +1598,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_saveCheckpoint_checkCheckpointStateIsSavedDatabaseNotExceededLimit() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
     assertThat(ephemeralState.checkpointState)
@@ -1429,7 +1609,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_saveCheckpoint_databaseFull_checkpointStateIsSavedDatabaseExceededLimit() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     // For testing, size limit of checkpoint database is set to 150 Bytes, this makes the database
     // exceed the allocated limit when checkpoint is saved on completing prototypeState 2.
@@ -1442,14 +1624,18 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_onSecondState_resumeExploration_expResumedFromCorrectPendingState() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
     endExploration()
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
     // Verify that we're on the second state of the second exploration.
@@ -1459,7 +1645,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_onSecondState_navigateBack_resumeExploration_checkResumedFromSecondState() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
@@ -1467,7 +1655,9 @@ class ExplorationProgressControllerTest {
     endExploration()
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
     // Verify that we're on the second state of the second exploration.
@@ -1477,7 +1667,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_onSecondState_submitWrongAns_resumeExploration_checkWrongAnswersVisible() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
@@ -1487,7 +1679,9 @@ class ExplorationProgressControllerTest {
     endExploration()
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
     // Verify that three wrong answers are visible to the user.
@@ -1497,7 +1691,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_onSecondState_submitRightAns_resumeExploration_expResumedFromCompState() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
@@ -1507,7 +1703,9 @@ class ExplorationProgressControllerTest {
     endExploration()
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
     // Verify that we're on the second state of the second exploration because the continue button
@@ -1518,7 +1716,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_submitAns_moveToNextState_resumeExploration_answersVisibleOnPrevState() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
@@ -1528,7 +1728,9 @@ class ExplorationProgressControllerTest {
     endExploration()
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     waitForGetCurrentStateSuccessfulLoad()
     val ephemeralState = moveToPreviousState()
 
@@ -1541,14 +1743,18 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_onSecondState_resumeExploration_checkPendingStateDoesNotHaveANextState() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
     endExploration()
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
     // Verify that we're on the second state of the second exploration because the continue button
@@ -1560,12 +1766,16 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_onFirstState_resumeExploration_checkStateDoesNotHaveAPrevState() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     endExploration()
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
     // Verify that we're on the second state of the second exploration because the continue button
@@ -1577,14 +1787,18 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_onSecondState_resumeExploration_checkFirstStateHasANextState() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
     endExploration()
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     waitForGetCurrentStateSuccessfulLoad()
     val ephemeralState = moveToPreviousState()
 
@@ -1597,14 +1811,18 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_onSecondState_resumeExploration_checkFirstStateDoesNotHaveAPrevState() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
     endExploration()
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     waitForGetCurrentStateSuccessfulLoad()
     val ephemeralState = moveToPreviousState()
 
@@ -1617,14 +1835,18 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_onSecondState_resumeExploration_checkSecondStateHasAPrevState() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
     endExploration()
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
     // Verify that we're on the second state of the second exploration because the continue button
@@ -1636,7 +1858,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_submitAns_doNotPressContinueBtn_resumeExp_pendingStateHasNoNextState() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
@@ -1644,7 +1868,9 @@ class ExplorationProgressControllerTest {
     endExploration()
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
     // Verify that the current state is a completed state but has no next state because we have
@@ -1656,14 +1882,18 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_noHintVisible_resumeExp_notHintVisibleOnPendingState() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
     endExploration()
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
     // Verify that the helpIndex.IndexTypeCase is equal to INDEX_TYPE_NOT_SET because no hint
@@ -1674,7 +1904,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_unrevealedHintIsVisible_resumeExp_unrevealedHintIsVisibleOnPendingState() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
@@ -1684,7 +1916,9 @@ class ExplorationProgressControllerTest {
     endExploration()
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
     // Verify that the helpIndex.IndexTypeCase is equal AVAILABLE_NEXT_HINT_HINT_INDEX because a new
@@ -1699,7 +1933,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_revealedHintIsVisible_resumeExp_revealedHintIsVisibleOnPendingState() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
@@ -1711,7 +1947,9 @@ class ExplorationProgressControllerTest {
     endExploration()
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
     // Verify that the helpIndex.IndexTypeCase is equal LATEST_REVEALED_HINT_INDEX because a new
@@ -1723,7 +1961,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_revealedHintIsVisible_resumeExp_wait10Seconds_solutionIsNotVisible() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
@@ -1735,7 +1975,9 @@ class ExplorationProgressControllerTest {
     endExploration()
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     waitForGetCurrentStateSuccessfulLoad()
     testCoroutineDispatchers.advanceTimeBy(TimeUnit.SECONDS.toMillis(10))
 
@@ -1750,7 +1992,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_revealedHintIsVisible_resumeExp_wait30Seconds_solutionIsNotVisible() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
@@ -1762,7 +2006,9 @@ class ExplorationProgressControllerTest {
     endExploration()
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     waitForGetCurrentStateSuccessfulLoad()
     testCoroutineDispatchers.advanceTimeBy(TimeUnit.SECONDS.toMillis(30))
 
@@ -1776,7 +2022,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_solutionIsVisible_resumeExp_unrevealedSolutionIsVisibleOnPendingState() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
@@ -1792,7 +2040,9 @@ class ExplorationProgressControllerTest {
     endExploration()
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
     // Verify that the helpIndex.IndexTypeCase is equal EVERYTHING_IS_REVEALED because all available
@@ -1805,7 +2055,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_revealedSolution_resumeExp_revealedSolIsVisibleOnPendingState() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     playThroughPrototypeState1AndMoveToNextState()
@@ -1824,7 +2076,9 @@ class ExplorationProgressControllerTest {
     endExploration()
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
     // Verify that the helpIndex.IndexTypeCase is equal EVERYTHING_IS_REVEALED because all available
@@ -1837,7 +2091,9 @@ class ExplorationProgressControllerTest {
 
   @Test
   fun testCheckpointing_playSomeStates_resumeExp_playRemainingState_verifyTerminalStateReached() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     // Play through some states in the exploration.
@@ -1849,7 +2105,9 @@ class ExplorationProgressControllerTest {
     endExploration()
 
     val checkpoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     // Resume exploration and play through the remaining states in the exploration.
@@ -1869,7 +2127,9 @@ class ExplorationProgressControllerTest {
   @RunOn(buildEnvironments = [BuildEnvironment.BAZEL]) // Languages unsupported in Gradle builds.
   fun testGetCurrentState_englishLocale_defaultContentLang_includesTranslationContextForEnglish() {
     forceDefaultLocale(Locale.US)
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
 
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
@@ -1885,7 +2145,9 @@ class ExplorationProgressControllerTest {
   @RunOn(buildEnvironments = [BuildEnvironment.BAZEL]) // Languages unsupported in Gradle builds.
   fun testGetCurrentState_arabicLocale_defaultContentLang_includesTranslationContextForArabic() {
     forceDefaultLocale(EGYPT_ARABIC_LOCALE)
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
 
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
@@ -1897,7 +2159,9 @@ class ExplorationProgressControllerTest {
   @Test
   fun testGetCurrentState_turkishLocale_defaultContentLang_includesDefaultTranslationContext() {
     forceDefaultLocale(TURKEY_TURKISH_LOCALE)
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
 
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
 
@@ -1911,7 +2175,11 @@ class ExplorationProgressControllerTest {
     val englishProfileId = ProfileId.newBuilder().apply { internalId = 1 }.build()
     updateContentLanguage(englishProfileId, OppiaLanguage.ENGLISH)
     startPlayingNewExploration(
-      TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, englishProfileId
+      TEST_CLASSROOM_ID_0,
+      TEST_TOPIC_ID_0,
+      TEST_STORY_ID_0,
+      TEST_EXPLORATION_ID_2,
+      englishProfileId
     )
 
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
@@ -1929,7 +2197,11 @@ class ExplorationProgressControllerTest {
     val englishProfileId = ProfileId.newBuilder().apply { internalId = 1 }.build()
     updateContentLanguage(englishProfileId, OppiaLanguage.ENGLISH)
     startPlayingNewExploration(
-      TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, englishProfileId
+      TEST_CLASSROOM_ID_0,
+      TEST_TOPIC_ID_0,
+      TEST_STORY_ID_0,
+      TEST_EXPLORATION_ID_2,
+      englishProfileId
     )
     val monitor = monitorFactory.createMonitor(explorationProgressController.getCurrentState())
     monitor.waitForNextSuccessResult()
@@ -1951,7 +2223,11 @@ class ExplorationProgressControllerTest {
     updateContentLanguage(englishProfileId, OppiaLanguage.ENGLISH)
     updateContentLanguage(arabicProfileId, OppiaLanguage.ARABIC)
     startPlayingNewExploration(
-      TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, arabicProfileId
+      TEST_CLASSROOM_ID_0,
+      TEST_TOPIC_ID_0,
+      TEST_STORY_ID_0,
+      TEST_EXPLORATION_ID_2,
+      arabicProfileId
     )
 
     val ephemeralState = waitForGetCurrentStateSuccessfulLoad()
@@ -1965,12 +2241,14 @@ class ExplorationProgressControllerTest {
   fun testPlayNewExploration_logsStartCardEvent() {
     logIntoAnalyticsReadyAdminProfile()
 
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     val exploration = loadExploration(TEST_EXPLORATION_ID_2)
     val eventLog = fakeAnalyticsEventLogger.getOldestEvent()
-    assertThat(fakeAnalyticsEventLogger.getEventListCount()).isEqualTo(4)
+    assertThat(fakeAnalyticsEventLogger.getEventListCount()).isEqualTo(5)
     assertThat(eventLog).hasStartCardContextThat {
       hasExplorationDetailsThat().containsTestExp2Details()
       hasExplorationDetailsThat().hasStateNameThat().isEqualTo(exploration.initStateName)
@@ -1984,7 +2262,9 @@ class ExplorationProgressControllerTest {
     val checkpoint = createTestExp2CheckpointToState6()
     fakeAnalyticsEventLogger.clearAllEvents()
 
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkpoint
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     // Resuming shouldn't log a 'start card' event.
@@ -2002,7 +2282,9 @@ class ExplorationProgressControllerTest {
     createTestExp2CheckpointToState6()
     fakeAnalyticsEventLogger.clearAllEvents()
 
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     val (eventLog1, eventLog2) = fakeAnalyticsEventLogger.getOldestEvents(count = 2)
@@ -2025,11 +2307,13 @@ class ExplorationProgressControllerTest {
     createTestExp2CheckpointToState6()
     fakeAnalyticsEventLogger.clearAllEvents()
 
-    replayExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    replayExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
-    val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
-    assertThat(fakeAnalyticsEventLogger.getEventListCount()).isEqualTo(1)
+    val eventLog = fakeAnalyticsEventLogger.getMostRecentEvents(2)[0]
+    assertThat(fakeAnalyticsEventLogger.getEventListCount()).isEqualTo(2)
     assertThat(eventLog).hasStartCardContextThat {
       hasExplorationDetailsThat().containsTestExp2Details()
       // The exploration should have been started over.
@@ -2042,7 +2326,9 @@ class ExplorationProgressControllerTest {
   fun testPlayNewExp_firstCard_notFinished_doesNotLogReachInvestedEngagementEvent() {
     logIntoAnalyticsReadyAdminProfile()
 
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     val hasEngagementEvent = fakeAnalyticsEventLogger.hasEventLogged {
@@ -2055,7 +2341,9 @@ class ExplorationProgressControllerTest {
   fun testPlayNewExp_finishFirstCard_moveToSecond_doesNotLogReachInvestedEngagementEvent() {
     logIntoAnalyticsReadyAdminProfile()
 
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
 
@@ -2069,7 +2357,9 @@ class ExplorationProgressControllerTest {
   fun testPlayNewExp_finishThreeCards_doNotProceed_doesNotLogReachInvestedEngagementEvent() {
     logIntoAnalyticsReadyAdminProfile()
 
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     playThroughPrototypeState2AndMoveToNextState()
@@ -2085,7 +2375,9 @@ class ExplorationProgressControllerTest {
   fun testPlayNewExp_finishThreeCards_moveToFour_logsReachInvestedEngagementEvent() {
     logIntoAnalyticsReadyAdminProfile()
 
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     playThroughPrototypeState2AndMoveToNextState()
@@ -2106,7 +2398,9 @@ class ExplorationProgressControllerTest {
   fun testPlayNewExp_finishFourCards_moveToFive_logsReachInvestedEngagementEventOnlyOnce() {
     logIntoAnalyticsReadyAdminProfile()
 
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     playThroughPrototypeState2AndMoveToNextState()
@@ -2124,13 +2418,17 @@ class ExplorationProgressControllerTest {
   @Test
   fun testPlayNewExp_firstTwo_startOver_playFirst_doesNotLogReachInvestedEngagementEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     playThroughPrototypeState2AndMoveToNextState()
 
     // Restart the exploration.
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
 
@@ -2145,13 +2443,17 @@ class ExplorationProgressControllerTest {
   @Test
   fun testPlayNewExp_firstTwo_startOver_playThreeAndMove_logsReachInvestedEngagementEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     playThroughPrototypeState2AndMoveToNextState()
 
     // Restart the exploration.
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     playThroughPrototypeState2AndMoveToNextState()
@@ -2169,10 +2471,29 @@ class ExplorationProgressControllerTest {
     }
   }
 
+  @Test
+  fun testPlayNewExp_logsStartExplorationEvent() {
+    logIntoAnalyticsReadyAdminProfile()
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
+    waitForGetCurrentStateSuccessfulLoad()
+
+    val hasStartExplorationEvent = fakeAnalyticsEventLogger.hasEventLogged {
+      it.context.activityContextCase == START_EXPLORATION_CONTEXT
+    }
+    assertThat(hasStartExplorationEvent).isTrue()
+
+    val eventLog = fakeAnalyticsEventLogger.getMostRecentEvents(4)[0]
+    assertThat(eventLog).hasStartExplorationContextThat().containsTestExp2Details()
+  }
+
   @Test
   fun testResumeExp_stateOneTwoDone_finishThreeAndMoveForward_noLogReachInvestedEngagementEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     playThroughPrototypeState2AndMoveToNextState()
@@ -2180,7 +2501,9 @@ class ExplorationProgressControllerTest {
     // End, then resume the exploration and complete the third state.
     endExploration()
     val checkPoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkPoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkPoint
+    )
     playThroughPrototypeState3AndMoveToNextState()
 
     // Despite the first three states now being completed, this isn't an engagement event since the
@@ -2194,7 +2517,9 @@ class ExplorationProgressControllerTest {
   @Test
   fun testResumeExp_stateOneTwoDone_finishThreeMoreAndMove_logsReachInvestedEngagementEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     playThroughPrototypeState2AndMoveToNextState()
@@ -2202,7 +2527,9 @@ class ExplorationProgressControllerTest {
     // End, then resume the exploration and complete the third state.
     endExploration()
     val checkPoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkPoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkPoint
+    )
     playThroughPrototypeState3AndMoveToNextState()
     playThroughPrototypeState4AndMoveToNextState()
     playThroughPrototypeState5AndMoveToNextState()
@@ -2223,7 +2550,9 @@ class ExplorationProgressControllerTest {
   @Test
   fun testResumeExp_finishThree_thenAnotherThreeAfterResume_logsInvestedEngagementEventTwice() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     playThroughPrototypeState2AndMoveToNextState()
@@ -2232,7 +2561,9 @@ class ExplorationProgressControllerTest {
     // End, then resume the exploration and complete the third state.
     endExploration()
     val checkPoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkPoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkPoint
+    )
     playThroughPrototypeState4AndMoveToNextState()
     playThroughPrototypeState5AndMoveToNextState()
     playThroughPrototypeState6AndMoveToNextState()
@@ -2264,14 +2595,18 @@ class ExplorationProgressControllerTest {
   @Test
   fun testResumeExp_submitCorrectAnswer_logsResumeLessonSubmitCorrectAnswerEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
 
     // End, then resume the exploration and submit correct answer.
     endExploration()
     val checkPoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkPoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkPoint
+    )
     submitPrototypeState2Answer()
 
     // Event should be logged for correct answer submission after returning to the lesson.
@@ -2284,14 +2619,18 @@ class ExplorationProgressControllerTest {
   @Test
   fun testResumeExp_submitIncorrectAnswer_logsResumeLessonSubmitIncorrectAnswerEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
 
     // End, then resume the exploration and submit incorrect answer.
     endExploration()
     val checkPoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
-    resumeExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkPoint)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkPoint
+    )
     submitWrongAnswerForPrototypeState2()
 
     // Event should be logged for incorrect answer submission after returning to the lesson.
@@ -2301,16 +2640,42 @@ class ExplorationProgressControllerTest {
     assertThat(resumeLessonSubmitIncorrectAnswerEventCount).isEqualTo(1)
   }
 
+  @Test
+  fun testResumeExp_doesNotLogStartExplorationEvent() {
+    logIntoAnalyticsReadyAdminProfile()
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
+    waitForGetCurrentStateSuccessfulLoad()
+    endExploration()
+
+    fakeAnalyticsEventLogger.clearAllEvents()
+
+    val checkPoint = retrieveExplorationCheckpoint(TEST_EXPLORATION_ID_2)
+    resumeExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, checkPoint
+    )
+
+    val hasStartExplorationEvent = fakeAnalyticsEventLogger.hasEventLogged {
+      it.context.activityContextCase == START_EXPLORATION_CONTEXT
+    }
+    assertThat(hasStartExplorationEvent).isFalse()
+  }
+
   @Test
   fun testStartOverExp_submitCorrectAnswer_doesNotLogResumeLessonSubmitCorrectAnswerEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
 
     // End, then start over the exploration and submit correct answer.
     endExploration()
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     submitPrototypeState2Answer()
 
     // Event should not be logged for correct answer submission after returning to the lesson.
@@ -2323,13 +2688,17 @@ class ExplorationProgressControllerTest {
   @Test
   fun testStartOverExp_submitIncorrectAnswer_doesNotLogResumeLessonSubmitIncorrectAnswerEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
 
     // End, then resume the exploration and submit incorrect answer.
     endExploration()
-    restartExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     submitWrongAnswerForPrototypeState2()
 
     // Event should not be logged for incorrect answer submission after returning to the lesson.
@@ -2339,10 +2708,33 @@ class ExplorationProgressControllerTest {
     assertThat(resumeLessonSubmitIncorrectAnswerEventCount).isEqualTo(0)
   }
 
+  @Test
+  fun testStartOverExp_doesNotLogStartExplorationEvent() {
+    logIntoAnalyticsReadyAdminProfile()
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
+    waitForGetCurrentStateSuccessfulLoad()
+    endExploration()
+
+    fakeAnalyticsEventLogger.clearAllEvents()
+
+    restartExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
+
+    val hasStartExplorationEvent = fakeAnalyticsEventLogger.hasEventLogged {
+      it.context.activityContextCase == START_EXPLORATION_CONTEXT
+    }
+    assertThat(hasStartExplorationEvent).isFalse()
+  }
+
   @Test
   fun testReplayExp_submitCorrectAnswer_doesNotLogResumeLessonSubmitCorrectAnswerEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    replayExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    replayExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     submitPrototypeState2Answer()
 
     // Event should not be logged for correct answer submission after replaying lesson.
@@ -2355,7 +2747,9 @@ class ExplorationProgressControllerTest {
   @Test
   fun testReplayExp_submitIncorrectAnswer_doesNotLogResumeLessonSubmitIncorrectAnswerEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    replayExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    replayExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     submitWrongAnswerForPrototypeState2()
 
     // Event should not be logged for incorrect answer submission after replaying lesson.
@@ -2368,7 +2762,9 @@ class ExplorationProgressControllerTest {
   @Test
   fun testSubmitAnswer_correctAnswer_logsEndCardAndSubmitAnswerEvents() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     fakeAnalyticsEventLogger.clearAllEvents()
@@ -2392,7 +2788,9 @@ class ExplorationProgressControllerTest {
   @Test
   fun testSubmitAnswer_wrongAnswer_logsSubmitAnswerEvent_logsProgressSavingSuccessEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     fakeAnalyticsEventLogger.clearAllEvents()
@@ -2414,7 +2812,9 @@ class ExplorationProgressControllerTest {
   @Test
   fun testMoveToNextState_logsStartCardEvent_logsProgressSavingSuccessEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     submitPrototypeState1Answer()
     fakeAnalyticsEventLogger.clearAllEvents()
@@ -2436,7 +2836,9 @@ class ExplorationProgressControllerTest {
   @Test
   fun testHint_offered_logsHintOfferedEvent_logsProgressSavingSuccessEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
 
@@ -2468,7 +2870,9 @@ class ExplorationProgressControllerTest {
   @Test
   fun testHint_offeredThenViewed_logsRevealedHint_logsPgrssSavSuccEvent_logsExtingHintViwdEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     // Submit 2 wrong answers to trigger a hint becoming available.
@@ -2500,7 +2904,12 @@ class ExplorationProgressControllerTest {
   @Test
   fun testHint_existingHintViewed_logsExistingHintViewedEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0,
+      TEST_TOPIC_ID_0,
+      TEST_STORY_ID_0,
+      TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     // Submit 2 wrong answers to trigger a hint becoming available.
@@ -2523,7 +2932,12 @@ class ExplorationProgressControllerTest {
   @Test
   fun testHint_lastHintWithNoSolution_offered_logsHintOfferedEvent_logsProgressSavingSuccessEvt() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, FRACTIONS_EXPLORATION_ID_0)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_1,
+      FRACTIONS_TOPIC_ID,
+      FRACTIONS_STORY_ID_0,
+      FRACTIONS_EXPLORATION_ID_0
+    )
     waitForGetCurrentStateSuccessfulLoad()
     submitContinueButtonAnswerAndContinue() // 'Introduction' -> 'A Problem'
     submitContinueButtonAnswerAndContinue() // 'A Problem' -> 'Mr. Baker'
@@ -2557,7 +2971,12 @@ class ExplorationProgressControllerTest {
   @Test
   fun testHint_lastHintWithNoSol_offeredThenViewed_logsRevealedHintEvt_logsPgrssSavingSucssEvt() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(FRACTIONS_TOPIC_ID, FRACTIONS_STORY_ID_0, FRACTIONS_EXPLORATION_ID_0)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_1,
+      FRACTIONS_TOPIC_ID,
+      FRACTIONS_STORY_ID_0,
+      FRACTIONS_EXPLORATION_ID_0
+    )
     waitForGetCurrentStateSuccessfulLoad()
     submitContinueButtonAnswerAndContinue() // 'Introduction' -> 'A Problem'
     submitContinueButtonAnswerAndContinue() // 'A Problem' -> 'Mr. Baker'
@@ -2585,7 +3004,9 @@ class ExplorationProgressControllerTest {
   @Test
   fun testSolution_offered_logsSolutionOfferedEvent_logsProgressSavingSuccessEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     // Submit 2 wrong answers to trigger the hint.
@@ -2610,7 +3031,9 @@ class ExplorationProgressControllerTest {
   @Test
   fun testSolution_offeredThenViewed_logsViewSolutionEvent_logsProgressSavingSuccessEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     // Submit 2 wrong answers to trigger the hint.
@@ -2646,7 +3069,12 @@ class ExplorationProgressControllerTest {
   @Test
   fun testSolution_viewExistingSolution_logsExistingSolutionViewedEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0,
+      TEST_TOPIC_ID_0,
+      TEST_STORY_ID_0,
+      TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeState1AndMoveToNextState()
     // Submit 2 wrong answers to trigger the hint.
@@ -2675,7 +3103,9 @@ class ExplorationProgressControllerTest {
   @Test
   fun testEndExploration_withoutFinishing_logsExitExplorationEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     endExploration(isCompletion = false)
@@ -2688,7 +3118,9 @@ class ExplorationProgressControllerTest {
   @Test
   fun testEndExploration_afterFinishing_logsFinishExplorationEvent() {
     logIntoAnalyticsReadyAdminProfile()
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
     playThroughPrototypeExploration()
 
@@ -2704,7 +3136,9 @@ class ExplorationProgressControllerTest {
   fun testUpdateLanguageMidLesson_englishToSwahili_updatesProfilesContentLanguage() {
     logIntoAnalyticsReadyAdminProfile()
     updateContentLanguage(profileId, OppiaLanguage.ENGLISH)
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     val updateProv = explorationProgressController.updateWrittenTranslationContentLanguageMidLesson(
@@ -2725,7 +3159,9 @@ class ExplorationProgressControllerTest {
   fun testUpdateLanguageMidLesson_englishToSwahili_logsLanguageSwitchEvent() {
     logIntoAnalyticsReadyAdminProfile()
     updateContentLanguage(profileId, OppiaLanguage.ENGLISH)
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     val updateProv = explorationProgressController.updateWrittenTranslationContentLanguageMidLesson(
@@ -2753,7 +3189,11 @@ class ExplorationProgressControllerTest {
     updateContentLanguage(englishProfileId, OppiaLanguage.ENGLISH)
     updateContentLanguage(arabicProfileId, OppiaLanguage.ARABIC)
     startPlayingNewExploration(
-      TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, profileId = englishProfileId
+      TEST_CLASSROOM_ID_0,
+      TEST_TOPIC_ID_0,
+      TEST_STORY_ID_0,
+      TEST_EXPLORATION_ID_2,
+      englishProfileId
     )
     waitForGetCurrentStateSuccessfulLoad()
 
@@ -2777,7 +3217,9 @@ class ExplorationProgressControllerTest {
   fun testUpdateLanguageMidLesson_swahiliToEnglish_updatesProfilesContentLanguage() {
     logIntoAnalyticsReadyAdminProfile()
     updateContentLanguage(profileId, OppiaLanguage.SWAHILI)
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     val updateProv = explorationProgressController.updateWrittenTranslationContentLanguageMidLesson(
@@ -2798,7 +3240,9 @@ class ExplorationProgressControllerTest {
   fun testUpdateLanguageMidLesson_swahiliToEnglish_logsLanguageSwitchEvent() {
     logIntoAnalyticsReadyAdminProfile()
     updateContentLanguage(profileId, OppiaLanguage.SWAHILI)
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     val updateProv = explorationProgressController.updateWrittenTranslationContentLanguageMidLesson(
@@ -2823,7 +3267,12 @@ class ExplorationProgressControllerTest {
     oppiaClock.setFakeTimeMode(FakeOppiaClock.FakeTimeMode.MODE_UPTIME_MILLIS)
     explorationActiveTimeController.onAppInForeground()
 
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_4)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0,
+      TEST_TOPIC_ID_0,
+      TEST_STORY_ID_0,
+      TEST_EXPLORATION_ID_4
+    )
 
     val sessionTime = TimeUnit.MINUTES.toMillis(5)
 
@@ -2848,6 +3297,7 @@ class ExplorationProgressControllerTest {
   }
 
   private fun startPlayingNewExploration(
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -2855,12 +3305,13 @@ class ExplorationProgressControllerTest {
   ) {
     val startPlayingProvider =
       explorationDataController.startPlayingNewExploration(
-        profileId.internalId, topicId, storyId, explorationId
+        profileId.internalId, classroomId, topicId, storyId, explorationId
       )
     monitorFactory.waitForNextSuccessfulResult(startPlayingProvider)
   }
 
   private fun resumeExploration(
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -2869,12 +3320,13 @@ class ExplorationProgressControllerTest {
   ) {
     val startPlayingProvider =
       explorationDataController.resumeExploration(
-        profileId.internalId, topicId, storyId, explorationId, explorationCheckpoint
+        profileId.internalId, classroomId, topicId, storyId, explorationId, explorationCheckpoint
       )
     monitorFactory.waitForNextSuccessfulResult(startPlayingProvider)
   }
 
   private fun restartExploration(
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -2882,12 +3334,13 @@ class ExplorationProgressControllerTest {
   ) {
     val startPlayingProvider =
       explorationDataController.restartExploration(
-        profileId.internalId, topicId, storyId, explorationId
+        profileId.internalId, classroomId, topicId, storyId, explorationId
       )
     monitorFactory.waitForNextSuccessfulResult(startPlayingProvider)
   }
 
   private fun replayExploration(
+    classroomId: String,
     topicId: String,
     storyId: String,
     explorationId: String,
@@ -2895,7 +3348,7 @@ class ExplorationProgressControllerTest {
   ) {
     val startPlayingProvider =
       explorationDataController.replayExploration(
-        profileId.internalId, topicId, storyId, explorationId
+        profileId.internalId, classroomId, topicId, storyId, explorationId
       )
     monitorFactory.waitForNextSuccessfulResult(startPlayingProvider)
   }
@@ -2974,7 +3427,9 @@ class ExplorationProgressControllerTest {
   }
 
   private fun playThroughPrototypeExplorationInNewSession() {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     playThroughPrototypeExploration()
     endExploration()
   }
@@ -3292,6 +3747,7 @@ class ExplorationProgressControllerTest {
     pendingState.helpIndex.isSolutionRevealed()
 
   private fun EventLogSubject.ExplorationContextSubject.containsTestExp2Details() {
+    hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID_0)
     hasTopicIdThat().isEqualTo(TEST_TOPIC_ID_0)
     hasStoryIdThat().isEqualTo(TEST_STORY_ID_0)
     hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_2)
@@ -3304,6 +3760,7 @@ class ExplorationProgressControllerTest {
   }
 
   private fun EventLogSubject.ExplorationContextSubject.containsFractionsExp0Details() {
+    hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID_1)
     hasTopicIdThat().isEqualTo(FRACTIONS_TOPIC_ID)
     hasStoryIdThat().isEqualTo(FRACTIONS_STORY_ID_0)
     hasExplorationIdThat().isEqualTo(FRACTIONS_EXPLORATION_ID_0)
@@ -3350,7 +3807,9 @@ class ExplorationProgressControllerTest {
   }
 
   private fun createTestExp2CheckpointToState6(): ExplorationCheckpoint {
-    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    startPlayingNewExploration(
+      TEST_CLASSROOM_ID_0, TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2
+    )
     waitForGetCurrentStateSuccessfulLoad()
 
     // Play through some states in the exploration.
diff --git a/domain/src/test/java/org/oppia/android/domain/exploration/lightweightcheckpointing/ExplorationCheckpointControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/exploration/lightweightcheckpointing/ExplorationCheckpointControllerTest.kt
index 67f800e1c94..864af6b2745 100644
--- a/domain/src/test/java/org/oppia/android/domain/exploration/lightweightcheckpointing/ExplorationCheckpointControllerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/exploration/lightweightcheckpointing/ExplorationCheckpointControllerTest.kt
@@ -902,6 +902,7 @@ class ExplorationCheckpointControllerTest {
     )
     explorationDataController.startPlayingNewExploration(
       internalProfileId = profileId.internalId,
+      classroomId = "<none>",
       topicId = "<none>",
       storyId = "<none>",
       explorationId = TEST_CHECKPOINTING_FAKE_EXP_ID
diff --git a/domain/src/test/java/org/oppia/android/domain/oppialogger/OppiaLoggerTest.kt b/domain/src/test/java/org/oppia/android/domain/oppialogger/OppiaLoggerTest.kt
index 75c69117bf6..73c213b9b21 100644
--- a/domain/src/test/java/org/oppia/android/domain/oppialogger/OppiaLoggerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/oppialogger/OppiaLoggerTest.kt
@@ -62,6 +62,7 @@ import javax.inject.Singleton
 class OppiaLoggerTest {
   private companion object {
     private const val TEST_TIMESTAMP = 1234567898765
+    private const val TEST_CLASSROOM_ID = "test_classroomId"
     private const val TEST_TOPIC_ID = "test_topicId"
     private const val TEST_STORY_ID = "test_storyId"
     private const val TEST_EXPLORATION_ID = "test_explorationId"
@@ -220,6 +221,7 @@ class OppiaLoggerTest {
   @Test
   fun testController_createOpenExplorationActivityContext_returnsCorrectExplorationContext() {
     val eventContext = oppiaLogger.createOpenExplorationActivityContext(
+      TEST_CLASSROOM_ID,
       TEST_TOPIC_ID,
       TEST_STORY_ID,
       TEST_EXPLORATION_ID
diff --git a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsControllerTest.kt
index 935cf57e88a..aadb627472f 100644
--- a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsControllerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsControllerTest.kt
@@ -77,6 +77,7 @@ import javax.inject.Provider
 import javax.inject.Singleton
 
 private const val TEST_TIMESTAMP = 1556094120000
+private const val TEST_CLASSROOM_ID = "test_classroomId"
 private const val TEST_TOPIC_ID = "test_topicId"
 private const val TEST_STORY_ID = "test_storyId"
 private const val TEST_EXPLORATION_ID = "test_explorationId"
@@ -138,6 +139,7 @@ class AnalyticsControllerTest {
     setUpTestApplicationComponent()
     analyticsController.logImportantEvent(
       oppiaLogger.createOpenExplorationActivityContext(
+        TEST_CLASSROOM_ID,
         TEST_TOPIC_ID,
         TEST_STORY_ID,
         TEST_EXPLORATION_ID
@@ -383,6 +385,7 @@ class AnalyticsControllerTest {
     setUpTestApplicationComponent()
     analyticsController.logLowPriorityEvent(
       oppiaLogger.createOpenExplorationActivityContext(
+        TEST_CLASSROOM_ID,
         TEST_TOPIC_ID,
         TEST_STORY_ID,
         TEST_EXPLORATION_ID
diff --git a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/FeatureFlagsLoggerTest.kt b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/FeatureFlagsLoggerTest.kt
index d62953c56f0..73abeb09be5 100644
--- a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/FeatureFlagsLoggerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/FeatureFlagsLoggerTest.kt
@@ -46,6 +46,7 @@ import org.oppia.android.util.networking.NetworkConnectionUtilDebugModule
 import org.oppia.android.util.platformparameter.APP_AND_OS_DEPRECATION
 import org.oppia.android.util.platformparameter.DOWNLOADS_SUPPORT
 import org.oppia.android.util.platformparameter.EDIT_ACCOUNTS_OPTIONS_UI
+import org.oppia.android.util.platformparameter.ENABLE_MULTIPLE_CLASSROOMS
 import org.oppia.android.util.platformparameter.ENABLE_NPS_SURVEY
 import org.oppia.android.util.platformparameter.ENABLE_ONBOARDING_FLOW_V2
 import org.oppia.android.util.platformparameter.ENABLE_PERFORMANCE_METRICS_COLLECTION
@@ -152,7 +153,7 @@ class FeatureFlagsLoggerTest {
 
   @Test
   fun testLogFeatureFlags_correctNumberOfFeatureFlagsIsLogged() {
-    val expectedFeatureFlagCount = 12
+    val expectedFeatureFlagCount = 13
 
     featureFlagsLogger.logAllFeatureFlags(TEST_SESSION_ID)
     testCoroutineDispatchers.runCurrent()
@@ -185,6 +186,7 @@ class FeatureFlagsLoggerTest {
   @Iteration("app_and_os_deprecation", "index=9", "flagName=$APP_AND_OS_DEPRECATION")
   @Iteration("enable_nps_survey", "index=10", "flagName=$ENABLE_NPS_SURVEY")
   @Iteration("enable_onboarding_flow_v2", "index=11", "flagName=$ENABLE_ONBOARDING_FLOW_V2")
+  @Iteration("enable_multiple_classrooms", "index=12", "flagName=$ENABLE_MULTIPLE_CLASSROOMS")
   fun testLogFeatureFlags_allFeatureFlagNamesAreLogged() {
     featureFlagsLogger.logAllFeatureFlags(TEST_SESSION_ID)
 
diff --git a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/LearnerAnalyticsLoggerTest.kt b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/LearnerAnalyticsLoggerTest.kt
index 7b6f52d63af..30523eb52e7 100644
--- a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/LearnerAnalyticsLoggerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/LearnerAnalyticsLoggerTest.kt
@@ -82,6 +82,7 @@ class LearnerAnalyticsLoggerTest {
     private const val TEST_INSTALL_ID = "test_installation_id"
     private const val TEST_LEARNER_ID = "test_learner_id"
     private const val UNKNOWN_INSTALL_ID = "unknown_installation_id"
+    private const val TEST_CLASSROOM_ID = "test_classroom_id"
     private const val TEST_TOPIC_ID = "test_topic_id"
     private const val TEST_STORY_ID = "test_story_id"
     private const val TEST_EXP_5_STATE_THREE_NAME = "NumericExpressionInput.IsEquivalentTo"
@@ -614,6 +615,48 @@ class LearnerAnalyticsLoggerTest {
     }
   }
 
+  @Test
+  fun testExpLogger_logStartExploration_outsideCard_logsConsoleWarningAndNoEvents() {
+    val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
+    val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
+    testCoroutineDispatchers.runCurrent()
+
+    expLogger.logStartExploration()
+    testCoroutineDispatchers.runCurrent()
+
+    val log = ShadowLog.getLogs().getMostRecentWithTag("LearnerAnalyticsLogger")
+    assertThat(log.msg).contains("Attempting to log a state event outside state")
+    assertThat(log.type).isEqualTo(Log.WARN)
+    assertThat(fakeAnalyticsEventLogger.noEventsPresent()).isTrue()
+  }
+
+  @Test
+  fun testExpLogger_logStartExploration_insideCard_logsStateEventWithStateName() {
+    val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
+    val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
+    expLogger.startCard(exploration5.getStateByName(TEST_EXP_5_STATE_THREE_NAME))
+    testCoroutineDispatchers.runCurrent()
+
+    expLogger.logStartExploration()
+    testCoroutineDispatchers.runCurrent()
+
+    val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
+    assertThat(eventLog).isEssentialPriority()
+    assertThat(eventLog).hasStartExplorationContextThat {
+      hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
+      hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
+      hasStoryIdThat().isEqualTo(TEST_STORY_ID)
+      hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
+      hasSessionIdThat().isEqualTo(DEFAULT_INITIAL_SESSION_ID)
+      hasVersionThat().isEqualTo(5)
+      hasStateNameThat().isEqualTo(TEST_EXP_5_STATE_THREE_NAME)
+      hasLearnerDetailsThat {
+        hasLearnerIdThat().isEqualTo(TEST_LEARNER_ID)
+        hasInstallationIdThat().isEqualTo(TEST_INSTALL_ID)
+      }
+    }
+  }
+
   @Test
   fun testExpLogger_logExitExploration_outsideCard_logsConsoleWarningAndNoEvents() {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
@@ -642,6 +685,7 @@ class LearnerAnalyticsLoggerTest {
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
     assertThat(eventLog).hasExitExplorationContextThat {
+      hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
       hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
       hasStoryIdThat().isEqualTo(TEST_STORY_ID)
       hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -683,6 +727,7 @@ class LearnerAnalyticsLoggerTest {
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
     assertThat(eventLog).hasFinishExplorationContextThat {
+      hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
       hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
       hasStoryIdThat().isEqualTo(TEST_STORY_ID)
       hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -710,6 +755,7 @@ class LearnerAnalyticsLoggerTest {
     assertThat(eventLog).isEssentialPriority()
     assertThat(eventLog).hasStartCardContextThat {
       hasExplorationDetailsThat {
+        hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
         hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
         hasStoryIdThat().isEqualTo(TEST_STORY_ID)
         hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -754,6 +800,7 @@ class LearnerAnalyticsLoggerTest {
     assertThat(eventLog).isEssentialPriority()
     assertThat(eventLog).hasEndCardContextThat {
       hasExplorationDetailsThat {
+        hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
         hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
         hasStoryIdThat().isEqualTo(TEST_STORY_ID)
         hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -798,6 +845,7 @@ class LearnerAnalyticsLoggerTest {
     assertThat(eventLog).isEssentialPriority()
     assertThat(eventLog).hasHintUnlockedContextThat {
       hasExplorationDetailsThat {
+        hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
         hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
         hasStoryIdThat().isEqualTo(TEST_STORY_ID)
         hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -842,6 +890,7 @@ class LearnerAnalyticsLoggerTest {
     assertThat(eventLog).isEssentialPriority()
     assertThat(eventLog).hasRevealHintContextThat {
       hasExplorationDetailsThat {
+        hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
         hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
         hasStoryIdThat().isEqualTo(TEST_STORY_ID)
         hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -886,6 +935,7 @@ class LearnerAnalyticsLoggerTest {
     assertThat(eventLog).isEssentialPriority()
     assertThat(eventLog).hasViewExistingHintContextThat {
       hasExplorationDetailsThat {
+        hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
         hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
         hasStoryIdThat().isEqualTo(TEST_STORY_ID)
         hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -914,6 +964,7 @@ class LearnerAnalyticsLoggerTest {
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
     assertThat(eventLog).hasSolutionUnlockedContextThat {
+      hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
       hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
       hasStoryIdThat().isEqualTo(TEST_STORY_ID)
       hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -940,6 +991,7 @@ class LearnerAnalyticsLoggerTest {
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
     assertThat(eventLog).hasRevealSolutionContextThat {
+      hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
       hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
       hasStoryIdThat().isEqualTo(TEST_STORY_ID)
       hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -966,6 +1018,7 @@ class LearnerAnalyticsLoggerTest {
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
     assertThat(eventLog).hasViewExistingSolutionContextThat() {
+      hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
       hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
       hasStoryIdThat().isEqualTo(TEST_STORY_ID)
       hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -997,6 +1050,7 @@ class LearnerAnalyticsLoggerTest {
     assertThat(eventLog).isEssentialPriority()
     assertThat(eventLog).hasSubmitAnswerContextThat {
       hasExplorationDetailsThat {
+        hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
         hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
         hasStoryIdThat().isEqualTo(TEST_STORY_ID)
         hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -1045,6 +1099,7 @@ class LearnerAnalyticsLoggerTest {
     assertThat(eventLog).isEssentialPriority()
     assertThat(eventLog).hasPlayVoiceOverContextThat {
       hasExplorationDetailsThat {
+        hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
         hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
         hasStoryIdThat().isEqualTo(TEST_STORY_ID)
         hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -1121,6 +1176,7 @@ class LearnerAnalyticsLoggerTest {
     assertThat(eventLog).isEssentialPriority()
     assertThat(eventLog).hasPauseVoiceOverContextThat {
       hasExplorationDetailsThat {
+        hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
         hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
         hasStoryIdThat().isEqualTo(TEST_STORY_ID)
         hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -1205,6 +1261,51 @@ class LearnerAnalyticsLoggerTest {
     }
   }
 
+  @Test
+  @Iteration("no_install_id", "lid=learn", "iid=null", "elid=learn", "eid=")
+  @Iteration("no_learner_id", "lid=null", "iid=install", "elid=", "eid=install")
+  fun testExpLogger_logStartExploration_missingOneId_logsEventWithMissingId() {
+    val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
+    val expLogger =
+      learnerAnalyticsLogger.beginExploration(
+        exploration5, learnerId = learnerIdParameter, installationId = installIdParameter
+      )
+    testCoroutineDispatchers.runCurrent()
+    expLogger.startCard(exploration5.getStateByName(exploration5.initStateName))
+
+    expLogger.logStartExploration()
+    testCoroutineDispatchers.runCurrent()
+
+    val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
+    assertThat(eventLog).hasStartExplorationContextThat {
+      hasLearnerDetailsThat {
+        hasLearnerIdThat().isEqualTo(expectedLearnerIdParameter)
+        hasInstallationIdThat().isEqualTo(expectedInstallIdParameter)
+      }
+    }
+  }
+
+  @Test
+  fun testExpLogger_logStartExploration_noInstallOrLearnerIds_logsEventAndConsoleErrors() {
+    val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
+    val expLogger =
+      learnerAnalyticsLogger.beginExploration(exploration5, learnerId = null, installationId = null)
+    testCoroutineDispatchers.runCurrent()
+    expLogger.startCard(exploration5.getStateByName(exploration5.initStateName))
+
+    expLogger.logStartExploration()
+    testCoroutineDispatchers.runCurrent()
+
+    // Since both the learner & installation IDs are missing, the event logging fails since it would
+    // have no context. An unknown installation ID is used to indicate the installation ID was
+    // missing.
+    val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
+    val log = ShadowLog.getLogs().getMostRecentWithTag("LearnerAnalyticsLogger")
+    assertThat(eventLog).hasInstallIdForAnalyticsLogFailureThat().isEqualTo(UNKNOWN_INSTALL_ID)
+    assertThat(log.msg).contains("Event is being dropped due to incomplete event")
+    assertThat(log.type).isEqualTo(Log.ERROR)
+  }
+
   @Test
   @Iteration("no_install_id", "lid=learn", "iid=null", "elid=learn", "eid=")
   @Iteration("no_learner_id", "lid=null", "iid=install", "elid=", "eid=install")
@@ -1737,6 +1838,7 @@ class LearnerAnalyticsLoggerTest {
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
     assertThat(eventLog).hasReachedInvestedEngagementContextThat {
+      hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
       hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
       hasStoryIdThat().isEqualTo(TEST_STORY_ID)
       hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -1766,6 +1868,7 @@ class LearnerAnalyticsLoggerTest {
     assertThat(eventLog).isEssentialPriority()
     assertThat(eventLog).hasSwitchInLessonLanguageContextThat {
       hasExplorationDetailsThat {
+        hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
         hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
         hasStoryIdThat().isEqualTo(TEST_STORY_ID)
         hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -1798,6 +1901,7 @@ class LearnerAnalyticsLoggerTest {
     assertThat(eventLog).isEssentialPriority()
     assertThat(eventLog).hasSwitchInLessonLanguageContextThat {
       hasExplorationDetailsThat {
+        hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
         hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
         hasStoryIdThat().isEqualTo(TEST_STORY_ID)
         hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -1826,6 +1930,7 @@ class LearnerAnalyticsLoggerTest {
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasProgressSavingSuccessContextThat {
+      hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
       hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
       hasStoryIdThat().isEqualTo(TEST_STORY_ID)
       hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -1851,6 +1956,7 @@ class LearnerAnalyticsLoggerTest {
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasProgressSavingFailureContextThat {
+      hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
       hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
       hasStoryIdThat().isEqualTo(TEST_STORY_ID)
       hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -1876,6 +1982,7 @@ class LearnerAnalyticsLoggerTest {
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasLessonSavedAdvertentlyContextThat {
+      hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
       hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
       hasStoryIdThat().isEqualTo(TEST_STORY_ID)
       hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -1901,6 +2008,7 @@ class LearnerAnalyticsLoggerTest {
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasResumeLessonSubmitCorrectAnswerContextThat {
+      hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
       hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
       hasStoryIdThat().isEqualTo(TEST_STORY_ID)
       hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -1926,6 +2034,7 @@ class LearnerAnalyticsLoggerTest {
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasResumeLessonSubmitIncorrectAnswerContextThat {
+      hasClassroomIdThat().isEqualTo(TEST_CLASSROOM_ID)
       hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
       hasStoryIdThat().isEqualTo(TEST_STORY_ID)
       hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -1952,9 +2061,12 @@ class LearnerAnalyticsLoggerTest {
     installationId: String? = TEST_INSTALL_ID,
     profileId: ProfileId = this@LearnerAnalyticsLoggerTest.profileId,
     learnerId: String? = TEST_LEARNER_ID,
+    classroomId: String = TEST_CLASSROOM_ID,
     topicId: String = TEST_TOPIC_ID,
     storyId: String = TEST_STORY_ID
-  ) = beginExploration(installationId, profileId, learnerId, exploration, topicId, storyId)
+  ) = beginExploration(
+    installationId, profileId, learnerId, exploration, classroomId, topicId, storyId
+  )
 
   private fun List<ShadowLog.LogItem>.getMostRecentWithTag(tag: String) = last { it.tag == tag }
 
diff --git a/model/src/main/proto/arguments.proto b/model/src/main/proto/arguments.proto
index 3784edb8b83..2dab9440c9a 100644
--- a/model/src/main/proto/arguments.proto
+++ b/model/src/main/proto/arguments.proto
@@ -120,6 +120,9 @@ message ExplorationActivityParams {
   // The ID of the profile that wants to start an exploration play session.
   ProfileId profile_id = 1;
 
+  // The ID of the classroom to which the opening exploration belongs.
+  string classroom_id = 7;
+
   // The ID of the topic to which the opening exploration belongs.
   string topic_id = 2;
 
@@ -153,6 +156,9 @@ message ExplorationFragmentArguments {
   // The ID of the profile that wants to start an exploration play session.
   ProfileId profile_id = 1;
 
+  // The ID of the classroom to which the opening exploration belongs.
+  string classroom_id = 6;
+
   // The ID of the topic to which the opening exploration belongs.
   string topic_id = 2;
 
@@ -171,6 +177,9 @@ message ResumeLessonActivityParams {
   // The ID of the profile that wants to start an exploration play session.
   ProfileId profile_id = 1;
 
+  // The ID of the classroom to which the opening exploration belongs.
+  string classroom_id = 7;
+
   // The ID of the topic to which the opening exploration belongs.
   string topic_id = 2;
 
@@ -192,6 +201,9 @@ message ResumeLessonFragmentArguments {
   // The ID of the profile that wants to start an exploration play session.
   ProfileId profile_id = 1;
 
+  // The ID of the classroom to which the opening exploration belongs.
+  string classroom_id = 7;
+
   // The ID of the topic to which the opening exploration belongs.
   string topic_id = 2;
 
@@ -330,6 +342,9 @@ message SurveyActivityParams {
 
 // Represents the parameters needed to create TopicActivity.
 message TopicActivityParams {
+  // The ID of the classroom to which the topic to be loaded belongs.
+  string classroom_id = 3;
+
   // The ID of the topic to be loaded.
   string topic_id = 1;
 
@@ -339,6 +354,9 @@ message TopicActivityParams {
 
 // Arguments required when creating a TopicFragment.
 message TopicFragmentArguments {
+  // The ID of the classroom to which the topic to be loaded belongs.
+  string classroom_id = 3;
+
   // The ID of the topic to be loaded.
   string topic_id = 1;
 
@@ -573,6 +591,9 @@ message StateFragmentTestActivityParams {
   // The ID of the current profile.
   int32 internal_profile_id = 1;
 
+  // The ID of the classroom to which the triggering exploration belongs.
+  string classroom_id = 6;
+
   // The ID of the topic to which the triggering exploration belongs.
   string topic_id = 2;
 
@@ -708,6 +729,9 @@ message ProfileResetPinFragmentArguments {
 
 // Represents the parameters needed to create StoryActivity.
 message StoryActivityParams {
+  // The ID of the classroom to which the opening exploration belongs.
+  string classroom_id = 3;
+
   // The ID of the topic to which the opening exploration belongs.
   string topic_id = 1;
 
@@ -717,6 +741,9 @@ message StoryActivityParams {
 
 // Arguments required when creating a StoryFragment.
 message StoryFragmentArguments {
+  // The ID of the classroom to which the opening exploration belongs.
+  string classroom_id = 3;
+
   // The ID of the topic to which the opening exploration belongs.
   string topic_id = 1;
 
@@ -738,6 +765,9 @@ message TopicInfoFragmentArguments {
 
 // Arguments required when creating a TopicLessonsFragment.
 message TopicLessonsFragmentArguments {
+  // The ID of the classroom to which the opening exploration belongs.
+  string classroom_id = 3;
+
   // The ID of the topic to which the opening exploration belongs.
   string topic_id = 1;
 
diff --git a/model/src/main/proto/oppia_logger.proto b/model/src/main/proto/oppia_logger.proto
index 5ab3c9d32ff..a34f404aa07 100644
--- a/model/src/main/proto/oppia_logger.proto
+++ b/model/src/main/proto/oppia_logger.proto
@@ -126,6 +126,9 @@ message EventLog {
       // The event being logged is related to foregrounding of the application.
       LearnerDetailsContext app_in_foreground_context = 25;
 
+      // The event being logged is related to starting an exploration.
+      ExplorationContext start_exploration_context = 56;
+
       // The event being logged is related to exiting an exploration.
       ExplorationContext exit_exploration_context = 26;
 
@@ -322,6 +325,9 @@ message EventLog {
   // Represents the event context for all exploration related events containing learner-specific and
   // exploration-specific details.
   message ExplorationContext {
+    // The active classroom ID when the event is logged.
+    string classroom_id = 9;
+
     // The active topic ID when the event is logged.
     string topic_id = 1;
 
diff --git a/model/src/main/proto/topic.proto b/model/src/main/proto/topic.proto
index 6ec81bca22d..3587eb4e6ca 100755
--- a/model/src/main/proto/topic.proto
+++ b/model/src/main/proto/topic.proto
@@ -25,6 +25,9 @@ message Topic {
   // A brief description of the topic.
   SubtitledHtml description = 11;
 
+  // The ID of the classroom to which the topic belongs to.
+  string classroom_id = 12;
+
   // A list of summarized stories contained within this topic.
   repeated StorySummary story = 4;
 
@@ -236,6 +239,9 @@ message CompletedStory {
   // The title of the story being completed.
   SubtitledHtml story_title = 8;
 
+  // The ID of the classroom which contains this story.
+  string classroom_id = 10;
+
   // The ID of the topic which contains this story.
   string topic_id = 3;
 
diff --git a/scripts/src/java/org/oppia/android/scripts/coverage/CoverageRunner.kt b/scripts/src/java/org/oppia/android/scripts/coverage/CoverageRunner.kt
index e1ff9cdb221..b27cb822dbb 100644
--- a/scripts/src/java/org/oppia/android/scripts/coverage/CoverageRunner.kt
+++ b/scripts/src/java/org/oppia/android/scripts/coverage/CoverageRunner.kt
@@ -60,12 +60,13 @@ class CoverageRunner(
     val sfStartIdx = coverageData.indexOfFirst {
       it.startsWith("SF:") && it.substringAfter("SF:").substringAfterLast("/") == extractedFileName
     }
-    if (sfStartIdx == -1) throw IllegalArgumentException("File not found")
+    require(sfStartIdx != -1) {
+      "Coverage data not found for the file: $extractedFileName"
+    }
     val eofIdx = coverageData.subList(sfStartIdx, coverageData.size).indexOfFirst {
       it.startsWith("end_of_record")
     }
-    if (eofIdx == -1) throw IllegalArgumentException("End of record not found")
-
+    require(eofIdx != -1) { "End of record not found" }
     val fileSpecificCovDatLines = coverageData.subList(sfStartIdx, sfStartIdx + eofIdx + 1)
 
     val coverageDataProps = fileSpecificCovDatLines.groupBy { line ->
@@ -77,7 +78,7 @@ class CoverageRunner(
     }
 
     val filePath = coverageDataProps["SF"]?.firstOrNull()?.get(0)
-      ?: throw IllegalArgumentException("File path not found")
+    requireNotNull(filePath) { "File path not found" }
 
     val linesFound = coverageDataProps["LF"]?.singleOrNull()?.single()?.toInt() ?: 0
     val linesHit = coverageDataProps["LH"]?.singleOrNull()?.single()?.toInt() ?: 0
diff --git a/scripts/src/java/org/oppia/android/scripts/coverage/RunCoverage.kt b/scripts/src/java/org/oppia/android/scripts/coverage/RunCoverage.kt
index bf65548aecc..db5d381a711 100644
--- a/scripts/src/java/org/oppia/android/scripts/coverage/RunCoverage.kt
+++ b/scripts/src/java/org/oppia/android/scripts/coverage/RunCoverage.kt
@@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit
  *
  * Example:
  *     bazel run //scripts:run_coverage -- $(pwd)
- *     utility/src/main/java/org/oppia/android/util/parser/math/MathModel.kt HTML
+ *     utility/src/main/java/org/oppia/android/util/parser/math/MathModel.kt format=HTML
  * Example with custom process timeout:
  *     bazel run //scripts:run_coverage -- $(pwd)
  *     utility/src/main/java/org/oppia/android/util/parser/math/MathModel.kt processTimeout=10
@@ -33,10 +33,14 @@ import java.util.concurrent.TimeUnit
 fun main(vararg args: String) {
   val repoRoot = args[0]
   val filePath = args[1]
-  val format = args.getOrNull(2)
-  val reportFormat = when {
-    format.equals("HTML", ignoreCase = true) -> ReportFormat.HTML
-    format.equals("MARKDOWN", ignoreCase = true) || format == null -> ReportFormat.MARKDOWN
+
+  val format = args.find { it.startsWith("format=", ignoreCase = true) }
+    ?.substringAfter("=")
+    ?.uppercase() ?: "MARKDOWN"
+
+  val reportFormat = when (format) {
+    "HTML" -> ReportFormat.HTML
+    "MARKDOWN" -> ReportFormat.MARKDOWN
     else -> throw IllegalArgumentException("Unsupported report format: $format")
   }
 
@@ -98,14 +102,15 @@ class RunCoverage(
    * @return a list of lists containing coverage data for each requested test target, if
    *     the file is exempted from having a test file, an empty list is returned
    */
-  fun execute(): String {
+  fun execute() {
     val testFileExemptionList = loadTestFileExemptionsProto(testFileExemptionTextProto)
       .testFileExemptionList
       .filter { it.testFileNotRequired }
       .map { it.exemptedFilePath }
 
     if (filePath in testFileExemptionList) {
-      return "This file is exempted from having a test file; skipping coverage check."
+      println("This file is exempted from having a test file; skipping coverage check.")
+      return
     }
 
     val testFilePaths = findTestFile(repoRoot, filePath)
@@ -133,8 +138,6 @@ class RunCoverage(
         println("\nGenerated report at: $reportOutputPath\n")
       }
     } ?: println("No coverage reports generated.")
-
-    return reportOutputPath
   }
 
   private fun runCoverageForTarget(testTarget: String): CoverageReport {
diff --git a/scripts/src/java/org/oppia/android/scripts/testing/TestBazelWorkspace.kt b/scripts/src/java/org/oppia/android/scripts/testing/TestBazelWorkspace.kt
index d9ba7d2fd70..482425d64c7 100644
--- a/scripts/src/java/org/oppia/android/scripts/testing/TestBazelWorkspace.kt
+++ b/scripts/src/java/org/oppia/android/scripts/testing/TestBazelWorkspace.kt
@@ -30,7 +30,14 @@ class TestBazelWorkspace(private val temporaryRootFolder: TemporaryFolder) {
     temporaryRootFolder.newFile(".bazelversion").also { it.writeText(BAZEL_VERSION) }
   }
   private val bazelRcFile by lazy {
-    temporaryRootFolder.newFile(".bazelrc").also { it.writeText("--noenable_bzlmod") }
+    temporaryRootFolder.newFile(".bazelrc").also {
+      it.writeText(
+        """
+          --noenable_bzlmod
+          build --java_runtime_version=remotejdk_11 --tool_java_runtime_version=remotejdk_11
+        """.trimIndent()
+      )
+    }
   }
 
   private val testFileMap = mutableMapOf<String, File>()
diff --git a/scripts/src/javatests/org/oppia/android/scripts/coverage/BUILD.bazel b/scripts/src/javatests/org/oppia/android/scripts/coverage/BUILD.bazel
index d67bf159ebe..b58902a767a 100644
--- a/scripts/src/javatests/org/oppia/android/scripts/coverage/BUILD.bazel
+++ b/scripts/src/javatests/org/oppia/android/scripts/coverage/BUILD.bazel
@@ -6,7 +6,9 @@ load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_test")
 
 kt_jvm_test(
     name = "RunCoverageTest",
+    size = "large",
     srcs = ["RunCoverageTest.kt"],
+    shard_count = 4,
     deps = [
         "//scripts:test_file_check_assets",
         "//scripts/src/java/org/oppia/android/scripts/coverage:run_coverage_lib",
diff --git a/scripts/src/javatests/org/oppia/android/scripts/coverage/CoverageReporterTest.kt b/scripts/src/javatests/org/oppia/android/scripts/coverage/CoverageReporterTest.kt
index 67db3ebb1a4..155885cce3d 100644
--- a/scripts/src/javatests/org/oppia/android/scripts/coverage/CoverageReporterTest.kt
+++ b/scripts/src/javatests/org/oppia/android/scripts/coverage/CoverageReporterTest.kt
@@ -71,7 +71,7 @@ class CoverageReporterTest {
   }
 
   @Test
-  fun testCoverageReporter_generateHTMLReport_hasCorrectContentAndFormatting() {
+  fun testCoverageReporter_generateHtmlReport_hasCorrectContentAndFormatting() {
     val sourceFile = tempFolder.newFile("SampleFile.kt")
     sourceFile.writeText(
       """
@@ -95,7 +95,7 @@ class CoverageReporterTest {
     )
     val (_, reportText) = reporter.generateRichTextReport()
 
-    val expectedHTML =
+    val expectedHtml =
       """
     <!DOCTYPE html>
     <html lang="en">
@@ -261,6 +261,6 @@ class CoverageReporterTest {
     </html>
       """.trimIndent()
 
-    assertThat(reportText).isEqualTo(expectedHTML)
+    assertThat(reportText).isEqualTo(expectedHtml)
   }
 }
diff --git a/scripts/src/javatests/org/oppia/android/scripts/coverage/RunCoverageTest.kt b/scripts/src/javatests/org/oppia/android/scripts/coverage/RunCoverageTest.kt
index b00415fcc31..a61a580373b 100644
--- a/scripts/src/javatests/org/oppia/android/scripts/coverage/RunCoverageTest.kt
+++ b/scripts/src/javatests/org/oppia/android/scripts/coverage/RunCoverageTest.kt
@@ -23,21 +23,56 @@ class RunCoverageTest {
   private val originalOut: PrintStream = System.out
 
   private val scriptBgDispatcher by lazy { ScriptBackgroundCoroutineDispatcher() }
-  private val commandExecutor by lazy { CommandExecutorImpl(scriptBgDispatcher) }
   private val longCommandExecutor by lazy { initializeCommandExecutorWithLongProcessWaitTime() }
 
   private lateinit var testBazelWorkspace: TestBazelWorkspace
-  private lateinit var sampleFilePath: String
-  private lateinit var sampleMDOutputPath: String
-  private lateinit var sampleHTMLOutputPath: String
+  private lateinit var coverageDir: String
+  private lateinit var markdownOutputPath: String
+  private lateinit var htmlOutputPath: String
+
+  private lateinit var sourceContent: String
+  private lateinit var testContent: String
 
   @Before
   fun setUp() {
-    sampleFilePath = "/path/to/Sample.kt"
-    sampleMDOutputPath = "${tempFolder.root}/coverage_reports/report.md"
-    sampleHTMLOutputPath = "${tempFolder.root}/coverage_reports/report.html"
+    coverageDir = "/coverage_reports"
+    markdownOutputPath = "${tempFolder.root}/coverage_reports/report.md"
+    htmlOutputPath = "${tempFolder.root}/coverage_reports/report.html"
     testBazelWorkspace = TestBazelWorkspace(tempFolder)
-    System.setOut(PrintStream(outContent))
+
+    sourceContent =
+      """
+      package com.example
+      
+      class TwoSum {
+        companion object {
+          fun sumNumbers(a: Int, b: Int): Any {
+            return if (a == 0 && b == 0) {
+                "Both numbers are zero"
+            } else {
+                a + b
+            }
+          }
+        }
+      }
+      """.trimIndent()
+
+    testContent =
+      """
+      package com.example
+      
+      import org.junit.Assert.assertEquals
+      import org.junit.Test
+      
+      class TwoSumTest {
+        @Test
+        fun testSumNumbers() {
+          assertEquals(TwoSum.sumNumbers(0, 1), 1)
+          assertEquals(TwoSum.sumNumbers(3, 4), 7)         
+          assertEquals(TwoSum.sumNumbers(0, 0), "Both numbers are zero")
+        }
+      }
+      """.trimIndent()
   }
 
   @After
@@ -68,64 +103,121 @@ class RunCoverageTest {
     assertThat(exception).hasMessageThat().contains("No appropriate test file found")
   }
 
+  @Test
+  fun testRunCoverage_invalidFormat_throwsException() {
+    testBazelWorkspace.initEmptyWorkspace()
+    val exception = assertThrows<IllegalArgumentException>() {
+      main(tempFolder.root.absolutePath, "file.kt", "format=PDF")
+    }
+
+    assertThat(exception).hasMessageThat().contains("Unsupported report format")
+  }
+
+  @Test
+  fun testRunCoverage_ignoreCaseMarkdownArgument_returnsCoverageData() {
+    val filePath = "coverage/main/java/com/example/TwoSum.kt"
+
+    testBazelWorkspace.initEmptyWorkspace()
+    testBazelWorkspace.addSourceAndTestFileWithContent(
+      filename = "TwoSum",
+      testFilename = "TwoSumTest",
+      sourceContent = sourceContent,
+      testContent = testContent,
+      sourceSubpackage = "coverage/main/java/com/example",
+      testSubpackage = "coverage/test/java/com/example"
+    )
+
+    main(
+      "${tempFolder.root}",
+      filePath,
+      "format=Markdown",
+      "processTimeout=10"
+    )
+
+    val outputFilePath = "${tempFolder.root}" +
+      "$coverageDir/${filePath.removeSuffix(".kt")}/coverage.md"
+
+    assertThat(File(outputFilePath).exists()).isTrue()
+  }
+
+  @Test
+  fun testRunCoverage_ignoreCaseHtmlArgument_returnsCoverageData() {
+    val filePath = "coverage/main/java/com/example/TwoSum.kt"
+
+    testBazelWorkspace.initEmptyWorkspace()
+    testBazelWorkspace.addSourceAndTestFileWithContent(
+      filename = "TwoSum",
+      testFilename = "TwoSumTest",
+      sourceContent = sourceContent,
+      testContent = testContent,
+      sourceSubpackage = "coverage/main/java/com/example",
+      testSubpackage = "coverage/test/java/com/example"
+    )
+
+    main(
+      "${tempFolder.root}",
+      filePath,
+      "format=Html",
+      "processTimeout=10"
+    )
+
+    val outputFilePath = "${tempFolder.root}" +
+      "$coverageDir/${filePath.removeSuffix(".kt")}/coverage.html"
+
+    assertThat(File(outputFilePath).exists()).isTrue()
+  }
+
+  @Test
+  fun testRunCoverage_reorderedArguments_returnsCoverageData() {
+    val filePath = "coverage/main/java/com/example/TwoSum.kt"
+
+    testBazelWorkspace.initEmptyWorkspace()
+    testBazelWorkspace.addSourceAndTestFileWithContent(
+      filename = "TwoSum",
+      testFilename = "TwoSumTest",
+      sourceContent = sourceContent,
+      testContent = testContent,
+      sourceSubpackage = "coverage/main/java/com/example",
+      testSubpackage = "coverage/test/java/com/example"
+    )
+
+    main(
+      "${tempFolder.root}",
+      filePath,
+      "processTimeout=10",
+      "format=MARKDOWN"
+    )
+
+    val outputFilePath = "${tempFolder.root}" +
+      "$coverageDir/${filePath.removeSuffix(".kt")}/coverage.md"
+
+    assertThat(File(outputFilePath).exists()).isTrue()
+  }
+
   @Test
   fun testRunCoverage_testFileExempted_noCoverage() {
+    System.setOut(PrintStream(outContent))
     val exemptedFilePath = "app/src/main/java/org/oppia/android/app/activity/ActivityComponent.kt"
 
-    val result = RunCoverage(
+    RunCoverage(
       "${tempFolder.root}",
       exemptedFilePath,
       ReportFormat.MARKDOWN,
-      sampleMDOutputPath,
-      commandExecutor,
+      markdownOutputPath,
+      longCommandExecutor,
       scriptBgDispatcher
     ).execute()
 
-    assertThat(result).isEqualTo(
+    assertThat(outContent.toString().trim()).isEqualTo(
       "This file is exempted from having a test file; skipping coverage check."
     )
   }
 
   @Test
   fun testRunCoverage_sampleTestsDefaultFormat_returnsCoverageData() {
-    testBazelWorkspace.initEmptyWorkspace()
-
-    val sourceContent =
-      """
-      package com.example
-      
-      class TwoSum {
-      
-          companion object {
-              fun sumNumbers(a: Int, b: Int): Any {
-                  return if (a == 0 && b == 0) {
-                      "Both numbers are zero"
-                  } else {
-                      a + b
-                  }
-              }
-          }
-      }
-      """.trimIndent()
-
-    val testContent =
-      """
-      package com.example
-      
-      import org.junit.Assert.assertEquals
-      import org.junit.Test
-      
-      class TwoSumTest {
-      
-          @Test
-          fun testSumNumbers() {
-              assertEquals(TwoSum.sumNumbers(0, 1), 1)
-              assertEquals(TwoSum.sumNumbers(3, 4), 7)         
-              assertEquals(TwoSum.sumNumbers(0, 0), "Both numbers are zero")
-          }
-      }
-      """.trimIndent()
+    val filePath = "coverage/main/java/com/example/TwoSum.kt"
 
+    testBazelWorkspace.initEmptyWorkspace()
     testBazelWorkspace.addSourceAndTestFileWithContent(
       filename = "TwoSum",
       testFilename = "TwoSumTest",
@@ -137,65 +229,24 @@ class RunCoverageTest {
 
     main(
       "${tempFolder.root}",
-      "coverage/main/java/com/example/TwoSum.kt",
+      filePath,
     )
 
     val outputReportText = File(
-      "${tempFolder.root}/coverage_reports/coverage/main/java/com/example/TwoSum/coverage.md"
+      "${tempFolder.root}" +
+        "$coverageDir/${filePath.removeSuffix(".kt")}/coverage.md"
     ).readText()
 
-    val expectedResult =
-      """
-        ## Coverage Report
-        
-        - **Covered File:** coverage/main/java/com/example/TwoSum.kt
-        - **Coverage percentage:** 75.00% covered
-        - **Line coverage:** 3 / 4 lines covered
-      """.trimIndent()
+    val expectedResult = getExpectedMarkdownText(filePath)
 
     assertThat(outputReportText).isEqualTo(expectedResult)
   }
 
   @Test
   fun testRunCoverage_sampleTestsMarkdownFormat_returnsCoverageData() {
-    testBazelWorkspace.initEmptyWorkspace()
-
-    val sourceContent =
-      """
-      package com.example
-      
-      class TwoSum {
-      
-          companion object {
-              fun sumNumbers(a: Int, b: Int): Any {
-                  return if (a == 0 && b == 0) {
-                      "Both numbers are zero"
-                  } else {
-                      a + b
-                  }
-              }
-          }
-      }
-      """.trimIndent()
-
-    val testContent =
-      """
-      package com.example
-      
-      import org.junit.Assert.assertEquals
-      import org.junit.Test
-      
-      class TwoSumTest {
-      
-          @Test
-          fun testSumNumbers() {
-              assertEquals(TwoSum.sumNumbers(0, 1), 1)
-              assertEquals(TwoSum.sumNumbers(3, 4), 7)         
-              assertEquals(TwoSum.sumNumbers(0, 0), "Both numbers are zero")
-          }
-      }
-      """.trimIndent()
+    val filePath = "coverage/main/java/com/example/TwoSum.kt"
 
+    testBazelWorkspace.initEmptyWorkspace()
     testBazelWorkspace.addSourceAndTestFileWithContent(
       filename = "TwoSum",
       testFilename = "TwoSumTest",
@@ -207,67 +258,24 @@ class RunCoverageTest {
 
     RunCoverage(
       "${tempFolder.root}",
-      "coverage/main/java/com/example/TwoSum.kt",
+      filePath,
       ReportFormat.MARKDOWN,
-      sampleMDOutputPath,
+      markdownOutputPath,
       longCommandExecutor,
       scriptBgDispatcher
     ).execute()
 
-    val outputReportText = File(sampleMDOutputPath).readText()
-
-    val expectedResult =
-      """
-        ## Coverage Report
-        
-        - **Covered File:** coverage/main/java/com/example/TwoSum.kt
-        - **Coverage percentage:** 75.00% covered
-        - **Line coverage:** 3 / 4 lines covered
-      """.trimIndent()
+    val outputReportText = File(markdownOutputPath).readText()
+    val expectedResult = getExpectedMarkdownText(filePath)
 
     assertThat(outputReportText).isEqualTo(expectedResult)
   }
 
   @Test
   fun testRunCoverage_scriptTestsMarkdownFormat_returnsCoverageData() {
-    testBazelWorkspace.initEmptyWorkspace()
-
-    val sourceContent =
-      """
-      package com.example
-      
-      class TwoSum {
-      
-          companion object {
-              fun sumNumbers(a: Int, b: Int): Any {
-                  return if (a == 0 && b == 0) {
-                      "Both numbers are zero"
-                  } else {
-                      a + b
-                  }
-              }
-          }
-      }
-      """.trimIndent()
-
-    val testContent =
-      """
-      package com.example
-      
-      import org.junit.Assert.assertEquals
-      import org.junit.Test
-      
-      class TwoSumTest {
-      
-          @Test
-          fun testSumNumbers() {
-              assertEquals(TwoSum.sumNumbers(0, 1), 1)
-              assertEquals(TwoSum.sumNumbers(3, 4), 7)         
-              assertEquals(TwoSum.sumNumbers(0, 0), "Both numbers are zero")
-          }
-      }
-      """.trimIndent()
+    val filePath = "scripts/java/com/example/TwoSum.kt"
 
+    testBazelWorkspace.initEmptyWorkspace()
     testBazelWorkspace.addSourceAndTestFileWithContent(
       filename = "TwoSum",
       testFilename = "TwoSumTest",
@@ -279,67 +287,24 @@ class RunCoverageTest {
 
     RunCoverage(
       "${tempFolder.root}",
-      "scripts/java/com/example/TwoSum.kt",
+      filePath,
       ReportFormat.MARKDOWN,
-      sampleMDOutputPath,
+      markdownOutputPath,
       longCommandExecutor,
       scriptBgDispatcher
     ).execute()
 
-    val outputReportText = File(sampleMDOutputPath).readText()
-
-    val expectedResult =
-      """
-        ## Coverage Report
-        
-        - **Covered File:** scripts/java/com/example/TwoSum.kt
-        - **Coverage percentage:** 75.00% covered
-        - **Line coverage:** 3 / 4 lines covered
-      """.trimIndent()
+    val outputReportText = File(markdownOutputPath).readText()
+    val expectedResult = getExpectedMarkdownText(filePath)
 
     assertThat(outputReportText).isEqualTo(expectedResult)
   }
 
   @Test
   fun testRunCoverage_appTestsMarkdownFormat_returnsCoverageData() {
-    testBazelWorkspace.initEmptyWorkspace()
-
-    val sourceContent =
-      """
-      package com.example
-      
-      class TwoSum {
-      
-          companion object {
-              fun sumNumbers(a: Int, b: Int): Any {
-                  return if (a == 0 && b == 0) {
-                      "Both numbers are zero"
-                  } else {
-                      a + b
-                  }
-              }
-          }
-      }
-      """.trimIndent()
-
-    val testContent =
-      """
-      package com.example
-      
-      import org.junit.Assert.assertEquals
-      import org.junit.Test
-      
-      class TwoSumTest {
-      
-          @Test
-          fun testSumNumbers() {
-              assertEquals(TwoSum.sumNumbers(0, 1), 1)
-              assertEquals(TwoSum.sumNumbers(3, 4), 7)         
-              assertEquals(TwoSum.sumNumbers(0, 0), "Both numbers are zero")
-          }
-      }
-      """.trimIndent()
+    val filePath = "app/main/java/com/example/TwoSum.kt"
 
+    testBazelWorkspace.initEmptyWorkspace()
     testBazelWorkspace.addSourceAndTestFileWithContent(
       filename = "TwoSum",
       testFilename = "TwoSumTest",
@@ -351,50 +316,25 @@ class RunCoverageTest {
 
     RunCoverage(
       "${tempFolder.root}",
-      "app/main/java/com/example/TwoSum.kt",
+      filePath,
       ReportFormat.MARKDOWN,
-      sampleMDOutputPath,
+      markdownOutputPath,
       longCommandExecutor,
       scriptBgDispatcher
     ).execute()
 
-    val outputReportText = File(sampleMDOutputPath).readText()
-
-    val expectedResult =
-      """
-        ## Coverage Report
-        
-        - **Covered File:** app/main/java/com/example/TwoSum.kt
-        - **Coverage percentage:** 75.00% covered
-        - **Line coverage:** 3 / 4 lines covered
-      """.trimIndent()
+    val outputReportText = File(markdownOutputPath).readText()
+    val expectedResult = getExpectedMarkdownText(filePath)
 
     assertThat(outputReportText).isEqualTo(expectedResult)
   }
 
   @Test
   fun testRunCoverage_localTestsMarkdownFormat_returnsCoverageData() {
-    testBazelWorkspace.initEmptyWorkspace()
-
-    val sourceContent =
-      """
-      package com.example
-      
-      class TwoSum {
-      
-          companion object {
-              fun sumNumbers(a: Int, b: Int): Any {
-                  return if (a == 0 && b == 0) {
-                      "Both numbers are zero"
-                  } else {
-                      a + b
-                  }
-              }
-          }
-      }
-      """.trimIndent()
+    val filePath = "app/main/java/com/example/TwoSum.kt"
 
-    val testContent =
+    testBazelWorkspace.initEmptyWorkspace()
+    val testContentLocal =
       """
       package com.example
       
@@ -416,74 +356,31 @@ class RunCoverageTest {
       filename = "TwoSum",
       testFilename = "TwoSumLocalTest",
       sourceContent = sourceContent,
-      testContent = testContent,
+      testContent = testContentLocal,
       sourceSubpackage = "app/main/java/com/example",
       testSubpackage = "app/test/java/com/example"
     )
 
     RunCoverage(
       "${tempFolder.root}",
-      "app/main/java/com/example/TwoSum.kt",
+      filePath,
       ReportFormat.MARKDOWN,
-      sampleMDOutputPath,
+      markdownOutputPath,
       longCommandExecutor,
       scriptBgDispatcher
     ).execute()
 
-    val outputReportText = File(sampleMDOutputPath).readText()
-
-    val expectedResult =
-      """
-        ## Coverage Report
-        
-        - **Covered File:** app/main/java/com/example/TwoSum.kt
-        - **Coverage percentage:** 75.00% covered
-        - **Line coverage:** 3 / 4 lines covered
-      """.trimIndent()
+    val outputReportText = File(markdownOutputPath).readText()
+    val expectedResult = getExpectedMarkdownText(filePath)
 
     assertThat(outputReportText).isEqualTo(expectedResult)
   }
 
   @Test
   fun testRunCoverage_sharedTestsMarkdownFormat_returnsCoverageData() {
-    testBazelWorkspace.initEmptyWorkspace()
-
-    val sourceContent =
-      """
-      package com.example
-      
-      class TwoSum {
-      
-          companion object {
-              fun sumNumbers(a: Int, b: Int): Any {
-                  return if (a == 0 && b == 0) {
-                      "Both numbers are zero"
-                  } else {
-                      a + b
-                  }
-              }
-          }
-      }
-      """.trimIndent()
-
-    val testContent =
-      """
-      package com.example
-      
-      import org.junit.Assert.assertEquals
-      import org.junit.Test
-      
-      class TwoSumTest {
-      
-          @Test
-          fun testSumNumbers() {
-              assertEquals(TwoSum.sumNumbers(0, 1), 1)
-              assertEquals(TwoSum.sumNumbers(3, 4), 7)         
-              assertEquals(TwoSum.sumNumbers(0, 0), "Both numbers are zero")
-          }
-      }
-      """.trimIndent()
+    val filePath = "app/main/java/com/example/TwoSum.kt"
 
+    testBazelWorkspace.initEmptyWorkspace()
     testBazelWorkspace.addSourceAndTestFileWithContent(
       filename = "TwoSum",
       testFilename = "TwoSumTest",
@@ -495,67 +392,24 @@ class RunCoverageTest {
 
     RunCoverage(
       "${tempFolder.root}",
-      "app/main/java/com/example/TwoSum.kt",
+      filePath,
       ReportFormat.MARKDOWN,
-      sampleMDOutputPath,
+      markdownOutputPath,
       longCommandExecutor,
       scriptBgDispatcher
     ).execute()
 
-    val outputReportText = File(sampleMDOutputPath).readText()
-
-    val expectedResult =
-      """
-        ## Coverage Report
-        
-        - **Covered File:** app/main/java/com/example/TwoSum.kt
-        - **Coverage percentage:** 75.00% covered
-        - **Line coverage:** 3 / 4 lines covered
-      """.trimIndent()
+    val outputReportText = File(markdownOutputPath).readText()
+    val expectedResult = getExpectedMarkdownText(filePath)
 
     assertThat(outputReportText).isEqualTo(expectedResult)
   }
 
   @Test
   fun testRunCoverage_sharedAndLocalTestsMarkdownFormat_returnsCoverageData() {
-    testBazelWorkspace.initEmptyWorkspace()
-
-    val sourceContent =
-      """
-      package com.example
-      
-      class TwoSum {
-      
-          companion object {
-              fun sumNumbers(a: Int, b: Int): Any {
-                  return if (a == 0 && b == 0) {
-                      "Both numbers are zero"
-                  } else {
-                      a + b
-                  }
-              }
-          }
-      }
-      """.trimIndent()
-
-    val testContentShared =
-      """
-      package com.example
-      
-      import org.junit.Assert.assertEquals
-      import org.junit.Test
-      
-      class TwoSumTest {
-      
-          @Test
-          fun testSumNumbers() {
-              assertEquals(TwoSum.sumNumbers(0, 1), 1)
-              assertEquals(TwoSum.sumNumbers(3, 4), 7)         
-              assertEquals(TwoSum.sumNumbers(0, 0), "Both numbers are zero")
-          }
-      }
-      """.trimIndent()
+    val filePath = "app/main/java/com/example/TwoSum.kt"
 
+    testBazelWorkspace.initEmptyWorkspace()
     val testContentLocal =
       """
       package com.example
@@ -577,1028 +431,126 @@ class RunCoverageTest {
     testBazelWorkspace.addMultiLevelSourceAndTestFileWithContent(
       filename = "TwoSum",
       sourceContent = sourceContent,
-      testContentShared = testContentShared,
+      testContentShared = testContent,
       testContentLocal = testContentLocal,
       subpackage = "app"
     )
 
     RunCoverage(
       "${tempFolder.root}",
-      "app/main/java/com/example/TwoSum.kt",
+      filePath,
       ReportFormat.MARKDOWN,
-      sampleMDOutputPath,
+      markdownOutputPath,
       longCommandExecutor,
       scriptBgDispatcher
     ).execute()
 
-    val outputReportText = File(sampleMDOutputPath).readText()
-
-    val expectedResult =
-      """
-        ## Coverage Report
-        
-        - **Covered File:** app/main/java/com/example/TwoSum.kt
-        - **Coverage percentage:** 75.00% covered
-        - **Line coverage:** 3 / 4 lines covered
-      """.trimIndent()
+    val outputReportText = File(markdownOutputPath).readText()
+    val expectedResult = getExpectedMarkdownText(filePath)
 
     assertThat(outputReportText).isEqualTo(expectedResult)
   }
 
   @Test
-  fun testRunCoverage_sampleTestsHTMLFormat_returnsCoverageData() {
+  fun testRunCoverage_sampleTestsHtmlFormat_returnsCoverageData() {
+    val filePath = "coverage/main/java/com/example/TwoSum.kt"
+
     testBazelWorkspace.initEmptyWorkspace()
+    testBazelWorkspace.addSourceAndTestFileWithContent(
+      filename = "TwoSum",
+      testFilename = "TwoSumTest",
+      sourceContent = sourceContent,
+      testContent = testContent,
+      sourceSubpackage = "coverage/main/java/com/example",
+      testSubpackage = "coverage/test/java/com/example"
+    )
 
-    val sourceContent =
-      """
-      package com.example
-      
-      class TwoSum {
-      
-          companion object {
-              fun sumNumbers(a: Int, b: Int): Any {
-                  return if (a == 0 && b == 0) {
-                      "Both numbers are zero"
-                  } else {
-                      a + b
-                  }
-              }
-          }
-      }
-      """.trimIndent()
+    RunCoverage(
+      "${tempFolder.root}",
+      filePath,
+      ReportFormat.HTML,
+      htmlOutputPath,
+      longCommandExecutor,
+      scriptBgDispatcher
+    ).execute()
 
-    val testContent =
-      """
-      package com.example
-      
-      import org.junit.Assert.assertEquals
-      import org.junit.Test
-      
-      class TwoSumTest {
-      
-          @Test
-          fun testSumNumbers() {
-              assertEquals(TwoSum.sumNumbers(0, 1), 1)
-              assertEquals(TwoSum.sumNumbers(3, 4), 7)         
-              assertEquals(TwoSum.sumNumbers(0, 0), "Both numbers are zero")
-          }
-      }
-      """.trimIndent()
+    val outputReportText = File(htmlOutputPath).readText()
+    val expectedResult = getExpectedHtmlText(filePath)
+
+    assertThat(outputReportText).isEqualTo(expectedResult)
+  }
 
+  @Test
+  fun testRunCoverage_scriptTestsHtmlFormat_returnsCoverageData() {
+    val filePath = "scripts/java/com/example/TwoSum.kt"
+
+    testBazelWorkspace.initEmptyWorkspace()
     testBazelWorkspace.addSourceAndTestFileWithContent(
       filename = "TwoSum",
       testFilename = "TwoSumTest",
       sourceContent = sourceContent,
       testContent = testContent,
-      sourceSubpackage = "coverage/main/java/com/example",
-      testSubpackage = "coverage/test/java/com/example"
+      sourceSubpackage = "scripts/java/com/example",
+      testSubpackage = "scripts/javatests/com/example"
     )
 
     RunCoverage(
       "${tempFolder.root}",
-      "coverage/main/java/com/example/TwoSum.kt",
+      filePath,
       ReportFormat.HTML,
-      sampleHTMLOutputPath,
+      htmlOutputPath,
       longCommandExecutor,
       scriptBgDispatcher
     ).execute()
 
-    val outputReportText = File(sampleHTMLOutputPath).readText()
-
-    val expectedResult =
-      """
-    <!DOCTYPE html>
-    <html lang="en">
-    <head>
-      <meta charset="UTF-8">
-      <meta name="viewport" content="width=device-width, initial-scale=1.0">
-      <title>Coverage Report</title>
-      <style>
-        body {
-            font-family: Arial, sans-serif;
-            line-height: 1.6;
-            padding: 20px;
-        }
-        table {
-            width: 100%;
-            border-collapse: collapse;
-            margin-bottom: 20px;
-        }
-        th, td {
-            padding: 8px;
-            margin-left: 20px;
-            text-align: left;
-            border-bottom: 1px solid #fdfdfd;
-        }
-        .line-number-col {
-            width: 2%;
-        }
-        .line-number-row {
-            border-right: 1px dashed #000000
-        }
-        .source-code-col {
-            width: 98%;
-        }
-        .covered-line, .not-covered-line, .uncovered-line {
-            white-space: pre-wrap;
-            word-wrap: break-word;
-            box-sizing: border-box;
-            border-radius: 4px;
-            padding: 2px 8px 2px 4px;
-            display: inline-block;
-        }
-        .covered-line {
-            background-color: #c8e6c9; /* Light green */
-        }
-        .not-covered-line {
-            background-color: #ffcdd2; /* Light red */
-        }
-        .uncovered-line {
-            background-color: #f1f1f1; /* light gray */
-        }
-        .coverage-summary {
-          margin-bottom: 20px;
-        }
-        h2 {
-          text-align: center;
-        }
-        ul {
-          list-style-type: none;
-          padding: 0;
-          text-align: center;
-        }
-        .summary-box {
-          background-color: #f0f0f0;
-          border: 1px solid #ccc;
-          border-radius: 8px;
-          padding: 10px;
-          margin-bottom: 20px;
-          display: flex;
-          justify-content: space-between;
-          align-items: flex-start;
-        }
-        .summary-left {
-          text-align: left;
-        }
-        .summary-right {
-          text-align: right;
-        }
-        .legend {
-          display: flex;
-          align-items: center;
-        }
-        .legend-item {
-          width: 20px;
-          height: 10px;
-          margin-right: 5px;
-          border-radius: 2px;
-          display: inline-block;
-        }
-        .legend .covered {
-          background-color: #c8e6c9; /* Light green */
-        }
-        .legend .not-covered {
-          margin-left: 4px;
-          background-color: #ffcdd2; /* Light red */
-        }
-        @media screen and (max-width: 768px) {
-            body {
-                padding: 10px;
-            }
-            table {
-                width: auto;
-            }
-        }
-      </style>
-    </head>
-    <body>
-      <h2>Coverage Report</h2>
-      <div class="summary-box">
-        <div class="summary-left">
-          <strong>Covered File:</strong> coverage/main/java/com/example/TwoSum.kt <br>
-          <div class="legend">
-            <div class="legend-item covered"></div>
-            <span>Covered</span>
-            <div class="legend-item not-covered"></div>
-            <span>Uncovered</span>
-          </div>
-        </div>
-        <div class="summary-right">
-          <div><strong>Coverage percentage:</strong> 75.00%</div>
-          <div><strong>Line coverage:</strong> 3 / 4 covered</div>
-        </div>
-      </div>
-      <table>
-        <thead>
-          <tr>
-            <th class="line-number-col">Line No</th>
-            <th class="source-code-col">Source Code</th>
-          </tr>
-        </thead>
-        <tbody><tr>
-        <td class="line-number-row">   1</td>
-        <td class="uncovered-line">package com.example</td>
-    </tr><tr>
-        <td class="line-number-row">   2</td>
-        <td class="uncovered-line"></td>
-    </tr><tr>
-        <td class="line-number-row">   3</td>
-        <td class="not-covered-line">class TwoSum {</td>
-    </tr><tr>
-        <td class="line-number-row">   4</td>
-        <td class="uncovered-line"></td>
-    </tr><tr>
-        <td class="line-number-row">   5</td>
-        <td class="uncovered-line">    companion object {</td>
-    </tr><tr>
-        <td class="line-number-row">   6</td>
-        <td class="uncovered-line">        fun sumNumbers(a: Int, b: Int): Any {</td>
-    </tr><tr>
-        <td class="line-number-row">   7</td>
-        <td class="covered-line">            return if (a == 0 && b == 0) {</td>
-    </tr><tr>
-        <td class="line-number-row">   8</td>
-        <td class="covered-line">                "Both numbers are zero"</td>
-    </tr><tr>
-        <td class="line-number-row">   9</td>
-        <td class="uncovered-line">            } else {</td>
-    </tr><tr>
-        <td class="line-number-row">  10</td>
-        <td class="covered-line">                a + b</td>
-    </tr><tr>
-        <td class="line-number-row">  11</td>
-        <td class="uncovered-line">            }</td>
-    </tr><tr>
-        <td class="line-number-row">  12</td>
-        <td class="uncovered-line">        }</td>
-    </tr><tr>
-        <td class="line-number-row">  13</td>
-        <td class="uncovered-line">    }</td>
-    </tr><tr>
-        <td class="line-number-row">  14</td>
-        <td class="uncovered-line">}</td>
-    </tr>    </tbody>
-      </table>
-    </body>
-    </html>
-      """.trimIndent()
-
-    assertThat(outputReportText).isEqualTo(expectedResult)
-  }
-
-  @Test
-  fun testRunCoverage_scriptTestsHTMLFormat_returnsCoverageData() {
-    testBazelWorkspace.initEmptyWorkspace()
-
-    val sourceContent =
-      """
-      package com.example
-      
-      class TwoSum {
-      
-          companion object {
-              fun sumNumbers(a: Int, b: Int): Any {
-                  return if (a == 0 && b == 0) {
-                      "Both numbers are zero"
-                  } else {
-                      a + b
-                  }
-              }
-          }
-      }
-      """.trimIndent()
-
-    val testContent =
-      """
-      package com.example
-      
-      import org.junit.Assert.assertEquals
-      import org.junit.Test
-      
-      class TwoSumTest {
-      
-          @Test
-          fun testSumNumbers() {
-              assertEquals(TwoSum.sumNumbers(0, 1), 1)
-              assertEquals(TwoSum.sumNumbers(3, 4), 7)         
-              assertEquals(TwoSum.sumNumbers(0, 0), "Both numbers are zero")
-          }
-      }
-      """.trimIndent()
-
-    testBazelWorkspace.addSourceAndTestFileWithContent(
-      filename = "TwoSum",
-      testFilename = "TwoSumTest",
-      sourceContent = sourceContent,
-      testContent = testContent,
-      sourceSubpackage = "scripts/java/com/example",
-      testSubpackage = "scripts/javatests/com/example"
-    )
-
-    RunCoverage(
-      "${tempFolder.root}",
-      "scripts/java/com/example/TwoSum.kt",
-      ReportFormat.HTML,
-      sampleHTMLOutputPath,
-      longCommandExecutor,
-      scriptBgDispatcher
-    ).execute()
-
-    val outputReportText = File(sampleHTMLOutputPath).readText()
-
-    val expectedResult =
-      """
-    <!DOCTYPE html>
-    <html lang="en">
-    <head>
-      <meta charset="UTF-8">
-      <meta name="viewport" content="width=device-width, initial-scale=1.0">
-      <title>Coverage Report</title>
-      <style>
-        body {
-            font-family: Arial, sans-serif;
-            line-height: 1.6;
-            padding: 20px;
-        }
-        table {
-            width: 100%;
-            border-collapse: collapse;
-            margin-bottom: 20px;
-        }
-        th, td {
-            padding: 8px;
-            margin-left: 20px;
-            text-align: left;
-            border-bottom: 1px solid #fdfdfd;
-        }
-        .line-number-col {
-            width: 2%;
-        }
-        .line-number-row {
-            border-right: 1px dashed #000000
-        }
-        .source-code-col {
-            width: 98%;
-        }
-        .covered-line, .not-covered-line, .uncovered-line {
-            white-space: pre-wrap;
-            word-wrap: break-word;
-            box-sizing: border-box;
-            border-radius: 4px;
-            padding: 2px 8px 2px 4px;
-            display: inline-block;
-        }
-        .covered-line {
-            background-color: #c8e6c9; /* Light green */
-        }
-        .not-covered-line {
-            background-color: #ffcdd2; /* Light red */
-        }
-        .uncovered-line {
-            background-color: #f1f1f1; /* light gray */
-        }
-        .coverage-summary {
-          margin-bottom: 20px;
-        }
-        h2 {
-          text-align: center;
-        }
-        ul {
-          list-style-type: none;
-          padding: 0;
-          text-align: center;
-        }
-        .summary-box {
-          background-color: #f0f0f0;
-          border: 1px solid #ccc;
-          border-radius: 8px;
-          padding: 10px;
-          margin-bottom: 20px;
-          display: flex;
-          justify-content: space-between;
-          align-items: flex-start;
-        }
-        .summary-left {
-          text-align: left;
-        }
-        .summary-right {
-          text-align: right;
-        }
-        .legend {
-          display: flex;
-          align-items: center;
-        }
-        .legend-item {
-          width: 20px;
-          height: 10px;
-          margin-right: 5px;
-          border-radius: 2px;
-          display: inline-block;
-        }
-        .legend .covered {
-          background-color: #c8e6c9; /* Light green */
-        }
-        .legend .not-covered {
-          margin-left: 4px;
-          background-color: #ffcdd2; /* Light red */
-        }
-        @media screen and (max-width: 768px) {
-            body {
-                padding: 10px;
-            }
-            table {
-                width: auto;
-            }
-        }
-      </style>
-    </head>
-    <body>
-      <h2>Coverage Report</h2>
-      <div class="summary-box">
-        <div class="summary-left">
-          <strong>Covered File:</strong> scripts/java/com/example/TwoSum.kt <br>
-          <div class="legend">
-            <div class="legend-item covered"></div>
-            <span>Covered</span>
-            <div class="legend-item not-covered"></div>
-            <span>Uncovered</span>
-          </div>
-        </div>
-        <div class="summary-right">
-          <div><strong>Coverage percentage:</strong> 75.00%</div>
-          <div><strong>Line coverage:</strong> 3 / 4 covered</div>
-        </div>
-      </div>
-      <table>
-        <thead>
-          <tr>
-            <th class="line-number-col">Line No</th>
-            <th class="source-code-col">Source Code</th>
-          </tr>
-        </thead>
-        <tbody><tr>
-        <td class="line-number-row">   1</td>
-        <td class="uncovered-line">package com.example</td>
-    </tr><tr>
-        <td class="line-number-row">   2</td>
-        <td class="uncovered-line"></td>
-    </tr><tr>
-        <td class="line-number-row">   3</td>
-        <td class="not-covered-line">class TwoSum {</td>
-    </tr><tr>
-        <td class="line-number-row">   4</td>
-        <td class="uncovered-line"></td>
-    </tr><tr>
-        <td class="line-number-row">   5</td>
-        <td class="uncovered-line">    companion object {</td>
-    </tr><tr>
-        <td class="line-number-row">   6</td>
-        <td class="uncovered-line">        fun sumNumbers(a: Int, b: Int): Any {</td>
-    </tr><tr>
-        <td class="line-number-row">   7</td>
-        <td class="covered-line">            return if (a == 0 && b == 0) {</td>
-    </tr><tr>
-        <td class="line-number-row">   8</td>
-        <td class="covered-line">                "Both numbers are zero"</td>
-    </tr><tr>
-        <td class="line-number-row">   9</td>
-        <td class="uncovered-line">            } else {</td>
-    </tr><tr>
-        <td class="line-number-row">  10</td>
-        <td class="covered-line">                a + b</td>
-    </tr><tr>
-        <td class="line-number-row">  11</td>
-        <td class="uncovered-line">            }</td>
-    </tr><tr>
-        <td class="line-number-row">  12</td>
-        <td class="uncovered-line">        }</td>
-    </tr><tr>
-        <td class="line-number-row">  13</td>
-        <td class="uncovered-line">    }</td>
-    </tr><tr>
-        <td class="line-number-row">  14</td>
-        <td class="uncovered-line">}</td>
-    </tr>    </tbody>
-      </table>
-    </body>
-    </html>
-      """.trimIndent()
-
-    assertThat(outputReportText).isEqualTo(expectedResult)
-  }
-
-  @Test
-  fun testRunCoverage_appTestsHTMLFormat_returnsCoverageData() {
-    testBazelWorkspace.initEmptyWorkspace()
-
-    val sourceContent =
-      """
-      package com.example
-      
-      class TwoSum {
-      
-          companion object {
-              fun sumNumbers(a: Int, b: Int): Any {
-                  return if (a == 0 && b == 0) {
-                      "Both numbers are zero"
-                  } else {
-                      a + b
-                  }
-              }
-          }
-      }
-      """.trimIndent()
-
-    val testContent =
-      """
-      package com.example
-      
-      import org.junit.Assert.assertEquals
-      import org.junit.Test
-      
-      class TwoSumTest {
-      
-          @Test
-          fun testSumNumbers() {
-              assertEquals(TwoSum.sumNumbers(0, 1), 1)
-              assertEquals(TwoSum.sumNumbers(3, 4), 7)         
-              assertEquals(TwoSum.sumNumbers(0, 0), "Both numbers are zero")
-          }
-      }
-      """.trimIndent()
-
-    testBazelWorkspace.addSourceAndTestFileWithContent(
-      filename = "TwoSum",
-      testFilename = "TwoSumTest",
-      sourceContent = sourceContent,
-      testContent = testContent,
-      sourceSubpackage = "app/main/java/com/example",
-      testSubpackage = "app/test/java/com/example"
-    )
-
-    RunCoverage(
-      "${tempFolder.root}",
-      "app/main/java/com/example/TwoSum.kt",
-      ReportFormat.HTML,
-      sampleHTMLOutputPath,
-      longCommandExecutor,
-      scriptBgDispatcher
-    ).execute()
-
-    val outputReportText = File(sampleHTMLOutputPath).readText()
-
-    val expectedResult =
-      """
-    <!DOCTYPE html>
-    <html lang="en">
-    <head>
-      <meta charset="UTF-8">
-      <meta name="viewport" content="width=device-width, initial-scale=1.0">
-      <title>Coverage Report</title>
-      <style>
-        body {
-            font-family: Arial, sans-serif;
-            line-height: 1.6;
-            padding: 20px;
-        }
-        table {
-            width: 100%;
-            border-collapse: collapse;
-            margin-bottom: 20px;
-        }
-        th, td {
-            padding: 8px;
-            margin-left: 20px;
-            text-align: left;
-            border-bottom: 1px solid #fdfdfd;
-        }
-        .line-number-col {
-            width: 2%;
-        }
-        .line-number-row {
-            border-right: 1px dashed #000000
-        }
-        .source-code-col {
-            width: 98%;
-        }
-        .covered-line, .not-covered-line, .uncovered-line {
-            white-space: pre-wrap;
-            word-wrap: break-word;
-            box-sizing: border-box;
-            border-radius: 4px;
-            padding: 2px 8px 2px 4px;
-            display: inline-block;
-        }
-        .covered-line {
-            background-color: #c8e6c9; /* Light green */
-        }
-        .not-covered-line {
-            background-color: #ffcdd2; /* Light red */
-        }
-        .uncovered-line {
-            background-color: #f1f1f1; /* light gray */
-        }
-        .coverage-summary {
-          margin-bottom: 20px;
-        }
-        h2 {
-          text-align: center;
-        }
-        ul {
-          list-style-type: none;
-          padding: 0;
-          text-align: center;
-        }
-        .summary-box {
-          background-color: #f0f0f0;
-          border: 1px solid #ccc;
-          border-radius: 8px;
-          padding: 10px;
-          margin-bottom: 20px;
-          display: flex;
-          justify-content: space-between;
-          align-items: flex-start;
-        }
-        .summary-left {
-          text-align: left;
-        }
-        .summary-right {
-          text-align: right;
-        }
-        .legend {
-          display: flex;
-          align-items: center;
-        }
-        .legend-item {
-          width: 20px;
-          height: 10px;
-          margin-right: 5px;
-          border-radius: 2px;
-          display: inline-block;
-        }
-        .legend .covered {
-          background-color: #c8e6c9; /* Light green */
-        }
-        .legend .not-covered {
-          margin-left: 4px;
-          background-color: #ffcdd2; /* Light red */
-        }
-        @media screen and (max-width: 768px) {
-            body {
-                padding: 10px;
-            }
-            table {
-                width: auto;
-            }
-        }
-      </style>
-    </head>
-    <body>
-      <h2>Coverage Report</h2>
-      <div class="summary-box">
-        <div class="summary-left">
-          <strong>Covered File:</strong> app/main/java/com/example/TwoSum.kt <br>
-          <div class="legend">
-            <div class="legend-item covered"></div>
-            <span>Covered</span>
-            <div class="legend-item not-covered"></div>
-            <span>Uncovered</span>
-          </div>
-        </div>
-        <div class="summary-right">
-          <div><strong>Coverage percentage:</strong> 75.00%</div>
-          <div><strong>Line coverage:</strong> 3 / 4 covered</div>
-        </div>
-      </div>
-      <table>
-        <thead>
-          <tr>
-            <th class="line-number-col">Line No</th>
-            <th class="source-code-col">Source Code</th>
-          </tr>
-        </thead>
-        <tbody><tr>
-        <td class="line-number-row">   1</td>
-        <td class="uncovered-line">package com.example</td>
-    </tr><tr>
-        <td class="line-number-row">   2</td>
-        <td class="uncovered-line"></td>
-    </tr><tr>
-        <td class="line-number-row">   3</td>
-        <td class="not-covered-line">class TwoSum {</td>
-    </tr><tr>
-        <td class="line-number-row">   4</td>
-        <td class="uncovered-line"></td>
-    </tr><tr>
-        <td class="line-number-row">   5</td>
-        <td class="uncovered-line">    companion object {</td>
-    </tr><tr>
-        <td class="line-number-row">   6</td>
-        <td class="uncovered-line">        fun sumNumbers(a: Int, b: Int): Any {</td>
-    </tr><tr>
-        <td class="line-number-row">   7</td>
-        <td class="covered-line">            return if (a == 0 && b == 0) {</td>
-    </tr><tr>
-        <td class="line-number-row">   8</td>
-        <td class="covered-line">                "Both numbers are zero"</td>
-    </tr><tr>
-        <td class="line-number-row">   9</td>
-        <td class="uncovered-line">            } else {</td>
-    </tr><tr>
-        <td class="line-number-row">  10</td>
-        <td class="covered-line">                a + b</td>
-    </tr><tr>
-        <td class="line-number-row">  11</td>
-        <td class="uncovered-line">            }</td>
-    </tr><tr>
-        <td class="line-number-row">  12</td>
-        <td class="uncovered-line">        }</td>
-    </tr><tr>
-        <td class="line-number-row">  13</td>
-        <td class="uncovered-line">    }</td>
-    </tr><tr>
-        <td class="line-number-row">  14</td>
-        <td class="uncovered-line">}</td>
-    </tr>    </tbody>
-      </table>
-    </body>
-    </html>
-      """.trimIndent()
+    val outputReportText = File(htmlOutputPath).readText()
+    val expectedResult = getExpectedHtmlText(filePath)
 
     assertThat(outputReportText).isEqualTo(expectedResult)
   }
 
   @Test
-  fun testRunCoverage_localTestsHTMLFormat_returnsCoverageData() {
-    testBazelWorkspace.initEmptyWorkspace()
-
-    val sourceContent =
-      """
-      package com.example
-      
-      class TwoSum {
-      
-          companion object {
-              fun sumNumbers(a: Int, b: Int): Any {
-                  return if (a == 0 && b == 0) {
-                      "Both numbers are zero"
-                  } else {
-                      a + b
-                  }
-              }
-          }
-      }
-      """.trimIndent()
-
-    val testContent =
-      """
-      package com.example
-      
-      import org.junit.Assert.assertEquals
-      import org.junit.Test
-      
-      class TwoSumLocalTest {
-      
-          @Test
-          fun testSumNumbers() {
-              assertEquals(TwoSum.sumNumbers(0, 1), 1)
-              assertEquals(TwoSum.sumNumbers(3, 4), 7)         
-              assertEquals(TwoSum.sumNumbers(0, 0), "Both numbers are zero")
-          }
-      }
-      """.trimIndent()
+  fun testRunCoverage_appTestsHtmlFormat_returnsCoverageData() {
+    val filePath = "app/main/java/com/example/TwoSum.kt"
 
+    testBazelWorkspace.initEmptyWorkspace()
     testBazelWorkspace.addSourceAndTestFileWithContent(
       filename = "TwoSum",
-      testFilename = "TwoSumLocalTest",
+      testFilename = "TwoSumTest",
       sourceContent = sourceContent,
       testContent = testContent,
       sourceSubpackage = "app/main/java/com/example",
       testSubpackage = "app/test/java/com/example"
     )
 
-    RunCoverage(
-      "${tempFolder.root}",
-      "app/main/java/com/example/TwoSum.kt",
-      ReportFormat.HTML,
-      sampleHTMLOutputPath,
-      longCommandExecutor,
-      scriptBgDispatcher
-    ).execute()
-
-    val outputReportText = File(sampleHTMLOutputPath).readText()
-
-    val expectedResult =
-      """
-    <!DOCTYPE html>
-    <html lang="en">
-    <head>
-      <meta charset="UTF-8">
-      <meta name="viewport" content="width=device-width, initial-scale=1.0">
-      <title>Coverage Report</title>
-      <style>
-        body {
-            font-family: Arial, sans-serif;
-            line-height: 1.6;
-            padding: 20px;
-        }
-        table {
-            width: 100%;
-            border-collapse: collapse;
-            margin-bottom: 20px;
-        }
-        th, td {
-            padding: 8px;
-            margin-left: 20px;
-            text-align: left;
-            border-bottom: 1px solid #fdfdfd;
-        }
-        .line-number-col {
-            width: 2%;
-        }
-        .line-number-row {
-            border-right: 1px dashed #000000
-        }
-        .source-code-col {
-            width: 98%;
-        }
-        .covered-line, .not-covered-line, .uncovered-line {
-            white-space: pre-wrap;
-            word-wrap: break-word;
-            box-sizing: border-box;
-            border-radius: 4px;
-            padding: 2px 8px 2px 4px;
-            display: inline-block;
-        }
-        .covered-line {
-            background-color: #c8e6c9; /* Light green */
-        }
-        .not-covered-line {
-            background-color: #ffcdd2; /* Light red */
-        }
-        .uncovered-line {
-            background-color: #f1f1f1; /* light gray */
-        }
-        .coverage-summary {
-          margin-bottom: 20px;
-        }
-        h2 {
-          text-align: center;
-        }
-        ul {
-          list-style-type: none;
-          padding: 0;
-          text-align: center;
-        }
-        .summary-box {
-          background-color: #f0f0f0;
-          border: 1px solid #ccc;
-          border-radius: 8px;
-          padding: 10px;
-          margin-bottom: 20px;
-          display: flex;
-          justify-content: space-between;
-          align-items: flex-start;
-        }
-        .summary-left {
-          text-align: left;
-        }
-        .summary-right {
-          text-align: right;
-        }
-        .legend {
-          display: flex;
-          align-items: center;
-        }
-        .legend-item {
-          width: 20px;
-          height: 10px;
-          margin-right: 5px;
-          border-radius: 2px;
-          display: inline-block;
-        }
-        .legend .covered {
-          background-color: #c8e6c9; /* Light green */
-        }
-        .legend .not-covered {
-          margin-left: 4px;
-          background-color: #ffcdd2; /* Light red */
-        }
-        @media screen and (max-width: 768px) {
-            body {
-                padding: 10px;
-            }
-            table {
-                width: auto;
-            }
-        }
-      </style>
-    </head>
-    <body>
-      <h2>Coverage Report</h2>
-      <div class="summary-box">
-        <div class="summary-left">
-          <strong>Covered File:</strong> app/main/java/com/example/TwoSum.kt <br>
-          <div class="legend">
-            <div class="legend-item covered"></div>
-            <span>Covered</span>
-            <div class="legend-item not-covered"></div>
-            <span>Uncovered</span>
-          </div>
-        </div>
-        <div class="summary-right">
-          <div><strong>Coverage percentage:</strong> 75.00%</div>
-          <div><strong>Line coverage:</strong> 3 / 4 covered</div>
-        </div>
-      </div>
-      <table>
-        <thead>
-          <tr>
-            <th class="line-number-col">Line No</th>
-            <th class="source-code-col">Source Code</th>
-          </tr>
-        </thead>
-        <tbody><tr>
-        <td class="line-number-row">   1</td>
-        <td class="uncovered-line">package com.example</td>
-    </tr><tr>
-        <td class="line-number-row">   2</td>
-        <td class="uncovered-line"></td>
-    </tr><tr>
-        <td class="line-number-row">   3</td>
-        <td class="not-covered-line">class TwoSum {</td>
-    </tr><tr>
-        <td class="line-number-row">   4</td>
-        <td class="uncovered-line"></td>
-    </tr><tr>
-        <td class="line-number-row">   5</td>
-        <td class="uncovered-line">    companion object {</td>
-    </tr><tr>
-        <td class="line-number-row">   6</td>
-        <td class="uncovered-line">        fun sumNumbers(a: Int, b: Int): Any {</td>
-    </tr><tr>
-        <td class="line-number-row">   7</td>
-        <td class="covered-line">            return if (a == 0 && b == 0) {</td>
-    </tr><tr>
-        <td class="line-number-row">   8</td>
-        <td class="covered-line">                "Both numbers are zero"</td>
-    </tr><tr>
-        <td class="line-number-row">   9</td>
-        <td class="uncovered-line">            } else {</td>
-    </tr><tr>
-        <td class="line-number-row">  10</td>
-        <td class="covered-line">                a + b</td>
-    </tr><tr>
-        <td class="line-number-row">  11</td>
-        <td class="uncovered-line">            }</td>
-    </tr><tr>
-        <td class="line-number-row">  12</td>
-        <td class="uncovered-line">        }</td>
-    </tr><tr>
-        <td class="line-number-row">  13</td>
-        <td class="uncovered-line">    }</td>
-    </tr><tr>
-        <td class="line-number-row">  14</td>
-        <td class="uncovered-line">}</td>
-    </tr>    </tbody>
-      </table>
-    </body>
-    </html>
-      """.trimIndent()
+    RunCoverage(
+      "${tempFolder.root}",
+      filePath,
+      ReportFormat.HTML,
+      htmlOutputPath,
+      longCommandExecutor,
+      scriptBgDispatcher
+    ).execute()
+
+    val outputReportText = File(htmlOutputPath).readText()
+    val expectedResult = getExpectedHtmlText(filePath)
 
     assertThat(outputReportText).isEqualTo(expectedResult)
   }
 
   @Test
-  fun testRunCoverage_sharedTestsHTMLFormat_returnsCoverageData() {
-    testBazelWorkspace.initEmptyWorkspace()
-
-    val sourceContent =
-      """
-      package com.example
-      
-      class TwoSum {
-      
-          companion object {
-              fun sumNumbers(a: Int, b: Int): Any {
-                  return if (a == 0 && b == 0) {
-                      "Both numbers are zero"
-                  } else {
-                      a + b
-                  }
-              }
-          }
-      }
-      """.trimIndent()
+  fun testRunCoverage_localTestsHtmlFormat_returnsCoverageData() {
+    val filePath = "app/main/java/com/example/TwoSum.kt"
 
-    val testContent =
+    testBazelWorkspace.initEmptyWorkspace()
+    val testContentLocal =
       """
       package com.example
       
       import org.junit.Assert.assertEquals
       import org.junit.Test
       
-      class TwoSumTest {
+      class TwoSumLocalTest {
       
           @Test
           fun testSumNumbers() {
@@ -1611,245 +563,62 @@ class RunCoverageTest {
 
     testBazelWorkspace.addSourceAndTestFileWithContent(
       filename = "TwoSum",
-      testFilename = "TwoSumTest",
+      testFilename = "TwoSumLocalTest",
       sourceContent = sourceContent,
-      testContent = testContent,
+      testContent = testContentLocal,
       sourceSubpackage = "app/main/java/com/example",
-      testSubpackage = "app/sharedTest/java/com/example"
+      testSubpackage = "app/test/java/com/example"
     )
 
     RunCoverage(
       "${tempFolder.root}",
-      "app/main/java/com/example/TwoSum.kt",
+      filePath,
       ReportFormat.HTML,
-      sampleHTMLOutputPath,
+      htmlOutputPath,
       longCommandExecutor,
       scriptBgDispatcher
     ).execute()
 
-    val outputReportText = File(sampleHTMLOutputPath).readText()
-
-    val expectedResult =
-      """
-    <!DOCTYPE html>
-    <html lang="en">
-    <head>
-      <meta charset="UTF-8">
-      <meta name="viewport" content="width=device-width, initial-scale=1.0">
-      <title>Coverage Report</title>
-      <style>
-        body {
-            font-family: Arial, sans-serif;
-            line-height: 1.6;
-            padding: 20px;
-        }
-        table {
-            width: 100%;
-            border-collapse: collapse;
-            margin-bottom: 20px;
-        }
-        th, td {
-            padding: 8px;
-            margin-left: 20px;
-            text-align: left;
-            border-bottom: 1px solid #fdfdfd;
-        }
-        .line-number-col {
-            width: 2%;
-        }
-        .line-number-row {
-            border-right: 1px dashed #000000
-        }
-        .source-code-col {
-            width: 98%;
-        }
-        .covered-line, .not-covered-line, .uncovered-line {
-            white-space: pre-wrap;
-            word-wrap: break-word;
-            box-sizing: border-box;
-            border-radius: 4px;
-            padding: 2px 8px 2px 4px;
-            display: inline-block;
-        }
-        .covered-line {
-            background-color: #c8e6c9; /* Light green */
-        }
-        .not-covered-line {
-            background-color: #ffcdd2; /* Light red */
-        }
-        .uncovered-line {
-            background-color: #f1f1f1; /* light gray */
-        }
-        .coverage-summary {
-          margin-bottom: 20px;
-        }
-        h2 {
-          text-align: center;
-        }
-        ul {
-          list-style-type: none;
-          padding: 0;
-          text-align: center;
-        }
-        .summary-box {
-          background-color: #f0f0f0;
-          border: 1px solid #ccc;
-          border-radius: 8px;
-          padding: 10px;
-          margin-bottom: 20px;
-          display: flex;
-          justify-content: space-between;
-          align-items: flex-start;
-        }
-        .summary-left {
-          text-align: left;
-        }
-        .summary-right {
-          text-align: right;
-        }
-        .legend {
-          display: flex;
-          align-items: center;
-        }
-        .legend-item {
-          width: 20px;
-          height: 10px;
-          margin-right: 5px;
-          border-radius: 2px;
-          display: inline-block;
-        }
-        .legend .covered {
-          background-color: #c8e6c9; /* Light green */
-        }
-        .legend .not-covered {
-          margin-left: 4px;
-          background-color: #ffcdd2; /* Light red */
-        }
-        @media screen and (max-width: 768px) {
-            body {
-                padding: 10px;
-            }
-            table {
-                width: auto;
-            }
-        }
-      </style>
-    </head>
-    <body>
-      <h2>Coverage Report</h2>
-      <div class="summary-box">
-        <div class="summary-left">
-          <strong>Covered File:</strong> app/main/java/com/example/TwoSum.kt <br>
-          <div class="legend">
-            <div class="legend-item covered"></div>
-            <span>Covered</span>
-            <div class="legend-item not-covered"></div>
-            <span>Uncovered</span>
-          </div>
-        </div>
-        <div class="summary-right">
-          <div><strong>Coverage percentage:</strong> 75.00%</div>
-          <div><strong>Line coverage:</strong> 3 / 4 covered</div>
-        </div>
-      </div>
-      <table>
-        <thead>
-          <tr>
-            <th class="line-number-col">Line No</th>
-            <th class="source-code-col">Source Code</th>
-          </tr>
-        </thead>
-        <tbody><tr>
-        <td class="line-number-row">   1</td>
-        <td class="uncovered-line">package com.example</td>
-    </tr><tr>
-        <td class="line-number-row">   2</td>
-        <td class="uncovered-line"></td>
-    </tr><tr>
-        <td class="line-number-row">   3</td>
-        <td class="not-covered-line">class TwoSum {</td>
-    </tr><tr>
-        <td class="line-number-row">   4</td>
-        <td class="uncovered-line"></td>
-    </tr><tr>
-        <td class="line-number-row">   5</td>
-        <td class="uncovered-line">    companion object {</td>
-    </tr><tr>
-        <td class="line-number-row">   6</td>
-        <td class="uncovered-line">        fun sumNumbers(a: Int, b: Int): Any {</td>
-    </tr><tr>
-        <td class="line-number-row">   7</td>
-        <td class="covered-line">            return if (a == 0 && b == 0) {</td>
-    </tr><tr>
-        <td class="line-number-row">   8</td>
-        <td class="covered-line">                "Both numbers are zero"</td>
-    </tr><tr>
-        <td class="line-number-row">   9</td>
-        <td class="uncovered-line">            } else {</td>
-    </tr><tr>
-        <td class="line-number-row">  10</td>
-        <td class="covered-line">                a + b</td>
-    </tr><tr>
-        <td class="line-number-row">  11</td>
-        <td class="uncovered-line">            }</td>
-    </tr><tr>
-        <td class="line-number-row">  12</td>
-        <td class="uncovered-line">        }</td>
-    </tr><tr>
-        <td class="line-number-row">  13</td>
-        <td class="uncovered-line">    }</td>
-    </tr><tr>
-        <td class="line-number-row">  14</td>
-        <td class="uncovered-line">}</td>
-    </tr>    </tbody>
-      </table>
-    </body>
-    </html>
-      """.trimIndent()
+    val outputReportText = File(htmlOutputPath).readText()
+    val expectedResult = getExpectedHtmlText(filePath)
 
     assertThat(outputReportText).isEqualTo(expectedResult)
   }
 
   @Test
-  fun testRunCoverage_sharedAndLocalTestsHTMLFormat_returnsCoverageData() {
+  fun testRunCoverage_sharedTestsHtmlFormat_returnsCoverageData() {
+    val filePath = "app/main/java/com/example/TwoSum.kt"
+
     testBazelWorkspace.initEmptyWorkspace()
+    testBazelWorkspace.addSourceAndTestFileWithContent(
+      filename = "TwoSum",
+      testFilename = "TwoSumTest",
+      sourceContent = sourceContent,
+      testContent = testContent,
+      sourceSubpackage = "app/main/java/com/example",
+      testSubpackage = "app/sharedTest/java/com/example"
+    )
 
-    val sourceContent =
-      """
-      package com.example
-      
-      class TwoSum {
-      
-          companion object {
-              fun sumNumbers(a: Int, b: Int): Any {
-                  return if (a == 0 && b == 0) {
-                      "Both numbers are zero"
-                  } else {
-                      a + b
-                  }
-              }
-          }
-      }
-      """.trimIndent()
+    RunCoverage(
+      "${tempFolder.root}",
+      filePath,
+      ReportFormat.HTML,
+      htmlOutputPath,
+      longCommandExecutor,
+      scriptBgDispatcher
+    ).execute()
 
-    val testContentShared =
-      """
-      package com.example
-      
-      import org.junit.Assert.assertEquals
-      import org.junit.Test
-      
-      class TwoSumTest {
-      
-          @Test
-          fun testSumNumbers() {
-              assertEquals(TwoSum.sumNumbers(0, 1), 1)
-              assertEquals(TwoSum.sumNumbers(3, 4), 7)         
-              assertEquals(TwoSum.sumNumbers(0, 0), "Both numbers are zero")
-          }
-      }
-      """.trimIndent()
+    val outputReportText = File(htmlOutputPath).readText()
+    val expectedResult = getExpectedHtmlText(filePath)
+
+    assertThat(outputReportText).isEqualTo(expectedResult)
+  }
 
+  @Test
+  fun testRunCoverage_sharedAndLocalTestsHtmlFormat_returnsCoverageData() {
+    val filePath = "app/main/java/com/example/TwoSum.kt"
+
+    testBazelWorkspace.initEmptyWorkspace()
     val testContentLocal =
       """
       package com.example
@@ -1871,7 +640,7 @@ class RunCoverageTest {
     testBazelWorkspace.addMultiLevelSourceAndTestFileWithContent(
       filename = "TwoSum",
       sourceContent = sourceContent,
-      testContentShared = testContentShared,
+      testContentShared = testContent,
       testContentLocal = testContentLocal,
       subpackage = "app"
     )
@@ -1880,14 +649,32 @@ class RunCoverageTest {
       "${tempFolder.root}",
       "app/main/java/com/example/TwoSum.kt",
       ReportFormat.HTML,
-      sampleHTMLOutputPath,
+      htmlOutputPath,
       longCommandExecutor,
       scriptBgDispatcher
     ).execute()
 
-    val outputReportText = File(sampleHTMLOutputPath).readText()
+    val outputReportText = File(htmlOutputPath).readText()
+    val expectedResult = getExpectedHtmlText(filePath)
+
+    assertThat(outputReportText).isEqualTo(expectedResult)
+  }
+
+  private fun getExpectedMarkdownText(filePath: String): String {
+    val markdownText =
+      """
+        ## Coverage Report
+        
+        - **Covered File:** $filePath
+        - **Coverage percentage:** 75.00% covered
+        - **Line coverage:** 3 / 4 lines covered
+      """.trimIndent()
+
+    return markdownText
+  }
 
-    val expectedResult =
+  private fun getExpectedHtmlText(filePath: String): String {
+    val htmlText =
       """
     <!DOCTYPE html>
     <html lang="en">
@@ -1997,7 +784,7 @@ class RunCoverageTest {
       <h2>Coverage Report</h2>
       <div class="summary-box">
         <div class="summary-left">
-          <strong>Covered File:</strong> app/main/java/com/example/TwoSum.kt <br>
+          <strong>Covered File:</strong> $filePath <br>
           <div class="legend">
             <div class="legend-item covered"></div>
             <span>Covered</span>
@@ -2028,36 +815,33 @@ class RunCoverageTest {
         <td class="not-covered-line">class TwoSum {</td>
     </tr><tr>
         <td class="line-number-row">   4</td>
-        <td class="uncovered-line"></td>
+        <td class="uncovered-line">  companion object {</td>
     </tr><tr>
         <td class="line-number-row">   5</td>
-        <td class="uncovered-line">    companion object {</td>
+        <td class="uncovered-line">    fun sumNumbers(a: Int, b: Int): Any {</td>
     </tr><tr>
         <td class="line-number-row">   6</td>
-        <td class="uncovered-line">        fun sumNumbers(a: Int, b: Int): Any {</td>
+        <td class="covered-line">      return if (a == 0 && b == 0) {</td>
     </tr><tr>
         <td class="line-number-row">   7</td>
-        <td class="covered-line">            return if (a == 0 && b == 0) {</td>
+        <td class="covered-line">          "Both numbers are zero"</td>
     </tr><tr>
         <td class="line-number-row">   8</td>
-        <td class="covered-line">                "Both numbers are zero"</td>
+        <td class="uncovered-line">      } else {</td>
     </tr><tr>
         <td class="line-number-row">   9</td>
-        <td class="uncovered-line">            } else {</td>
+        <td class="covered-line">          a + b</td>
     </tr><tr>
         <td class="line-number-row">  10</td>
-        <td class="covered-line">                a + b</td>
+        <td class="uncovered-line">      }</td>
     </tr><tr>
         <td class="line-number-row">  11</td>
-        <td class="uncovered-line">            }</td>
+        <td class="uncovered-line">    }</td>
     </tr><tr>
         <td class="line-number-row">  12</td>
-        <td class="uncovered-line">        }</td>
+        <td class="uncovered-line">  }</td>
     </tr><tr>
         <td class="line-number-row">  13</td>
-        <td class="uncovered-line">    }</td>
-    </tr><tr>
-        <td class="line-number-row">  14</td>
         <td class="uncovered-line">}</td>
     </tr>    </tbody>
       </table>
@@ -2065,7 +849,7 @@ class RunCoverageTest {
     </html>
       """.trimIndent()
 
-    assertThat(outputReportText).isEqualTo(expectedResult)
+    return htmlText
   }
 
   private fun initializeCommandExecutorWithLongProcessWaitTime(): CommandExecutorImpl {
diff --git a/scripts/src/javatests/org/oppia/android/scripts/testing/TestBazelWorkspaceTest.kt b/scripts/src/javatests/org/oppia/android/scripts/testing/TestBazelWorkspaceTest.kt
index aeab27fe8d3..00d7c167a71 100644
--- a/scripts/src/javatests/org/oppia/android/scripts/testing/TestBazelWorkspaceTest.kt
+++ b/scripts/src/javatests/org/oppia/android/scripts/testing/TestBazelWorkspaceTest.kt
@@ -67,7 +67,12 @@ class TestBazelWorkspaceTest {
     // A .bazelversion file should now exist with the correct flags.
     val bazelRcFile = File(tempFolder.root, ".bazelrc")
     assertThat(bazelRcFile.exists()).isTrue()
-    assertThat(bazelRcFile.readText().trim()).isEqualTo("--noenable_bzlmod")
+    assertThat(bazelRcFile.readText().trim()).isEqualTo(
+      """
+        --noenable_bzlmod
+        build --java_runtime_version=remotejdk_11 --tool_java_runtime_version=remotejdk_11
+      """.trimIndent()
+    )
   }
 
   @Test
@@ -132,7 +137,12 @@ class TestBazelWorkspaceTest {
     )
 
     val bazelRcContent = tempFolder.getBazelRcFile().readText().trim()
-    assertThat(bazelRcContent).isEqualTo("--noenable_bzlmod")
+    assertThat(bazelRcContent).isEqualTo(
+      """
+        --noenable_bzlmod
+        build --java_runtime_version=remotejdk_11 --tool_java_runtime_version=remotejdk_11
+      """.trimIndent()
+    )
   }
 
   @Test
@@ -636,7 +646,12 @@ class TestBazelWorkspaceTest {
     )
 
     val bazelRcContent = tempFolder.getBazelRcFile().readText().trim()
-    assertThat(bazelRcContent).isEqualTo("--noenable_bzlmod")
+    assertThat(bazelRcContent).isEqualTo(
+      """
+        --noenable_bzlmod
+        build --java_runtime_version=remotejdk_11 --tool_java_runtime_version=remotejdk_11
+      """.trimIndent()
+    )
   }
 
   @Test
@@ -911,7 +926,12 @@ class TestBazelWorkspaceTest {
     testBazelWorkspace.createTest(testName = "FirstTest")
 
     val bazelRcContent = tempFolder.getBazelRcFile().readText().trim()
-    assertThat(bazelRcContent).isEqualTo("--noenable_bzlmod")
+    assertThat(bazelRcContent).isEqualTo(
+      """
+        --noenable_bzlmod
+        build --java_runtime_version=remotejdk_11 --tool_java_runtime_version=remotejdk_11
+      """.trimIndent()
+    )
   }
 
   @Test
@@ -1131,7 +1151,12 @@ class TestBazelWorkspaceTest {
     testBazelWorkspace.createLibrary(dependencyName = "ExampleDep")
 
     val bazelRcContent = tempFolder.getBazelRcFile().readText().trim()
-    assertThat(bazelRcContent).isEqualTo("--noenable_bzlmod")
+    assertThat(bazelRcContent).isEqualTo(
+      """
+        --noenable_bzlmod
+        build --java_runtime_version=remotejdk_11 --tool_java_runtime_version=remotejdk_11
+      """.trimIndent()
+    )
   }
 
   @Test
diff --git a/testing/src/main/java/org/oppia/android/testing/logging/EventLogSubject.kt b/testing/src/main/java/org/oppia/android/testing/logging/EventLogSubject.kt
index 62beee0a815..2100e3028b8 100644
--- a/testing/src/main/java/org/oppia/android/testing/logging/EventLogSubject.kt
+++ b/testing/src/main/java/org/oppia/android/testing/logging/EventLogSubject.kt
@@ -53,6 +53,7 @@ import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.REVEAL_S
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.SHOW_SURVEY_POPUP
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.SOLUTION_UNLOCKED_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.START_CARD_CONTEXT
+import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.START_EXPLORATION_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.START_OVER_EXPLORATION_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.SUBMIT_ANSWER_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.SWITCH_IN_LESSON_LANGUAGE
@@ -766,6 +767,32 @@ class EventLogSubject private constructor(
     hasAppInForegroundContextThat().block()
   }
 
+  /**
+   * Verifies that the [EventLog] under test has a context corresponding to
+   * [START_EXPLORATION_CONTEXT] (per [EventLog.Context.getActivityContextCase]).
+   */
+  fun hasStartExplorationContext() {
+    assertThat(actual.context.activityContextCase).isEqualTo(START_EXPLORATION_CONTEXT)
+  }
+
+  /**
+   * Verifies the [EventLog]'s context per [hasStartExplorationContext] and returns an
+   * [ExplorationContextSubject] to test the corresponding context.
+   */
+  fun hasStartExplorationContextThat(): ExplorationContextSubject {
+    hasStartExplorationContext()
+    return ExplorationContextSubject.assertThat(actual.context.startExplorationContext)
+  }
+
+  /**
+   * Verifies the [EventLog]'s context and executes [block] in the same way as
+   * [hasStartExplorationContextThat] except for the conditions of, and subject returned by,
+   * [hasStartExplorationContextThat].
+   */
+  fun hasStartExplorationContextThat(block: ExplorationContextSubject.() -> Unit) {
+    hasStartExplorationContextThat().block()
+  }
+
   /**
    * Verifies that the [EventLog] under test has a context corresponding to
    * [EXIT_EXPLORATION_CONTEXT] (per [EventLog.Context.getActivityContextCase]).
@@ -1535,6 +1562,14 @@ class EventLogSubject private constructor(
     metadata: FailureMetadata,
     private val actual: EventLog.ExplorationContext
   ) : LiteProtoSubject(metadata, actual) {
+    /**
+     * Returns a [StringSubject] to test [EventLog.ExplorationContext.getClassroomId].
+     *
+     * This method never fails since the underlying property defaults to empty string if it's not
+     * defined in the context.
+     */
+    fun hasClassroomIdThat(): StringSubject = assertThat(actual.classroomId)
+
     /**
      * Returns a [StringSubject] to test [EventLog.ExplorationContext.getTopicId].
      *
diff --git a/utility/src/main/java/org/oppia/android/util/logging/EventBundleCreator.kt b/utility/src/main/java/org/oppia/android/util/logging/EventBundleCreator.kt
index b833b340206..dde89bc818b 100644
--- a/utility/src/main/java/org/oppia/android/util/logging/EventBundleCreator.kt
+++ b/utility/src/main/java/org/oppia/android/util/logging/EventBundleCreator.kt
@@ -52,6 +52,7 @@ import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.REVEAL_S
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.SHOW_SURVEY_POPUP
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.SOLUTION_UNLOCKED_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.START_CARD_CONTEXT
+import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.START_EXPLORATION_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.START_OVER_EXPLORATION_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.SUBMIT_ANSWER_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.SWITCH_IN_LESSON_LANGUAGE
@@ -242,6 +243,7 @@ class EventBundleCreator @Inject constructor(
       PAUSE_VOICE_OVER_CONTEXT -> VoiceoverActionContext(activityName, pauseVoiceOverContext)
       APP_IN_BACKGROUND_CONTEXT -> LearnerDetailsContext(activityName, appInBackgroundContext)
       APP_IN_FOREGROUND_CONTEXT -> LearnerDetailsContext(activityName, appInForegroundContext)
+      START_EXPLORATION_CONTEXT -> ExplorationContext(activityName, startExplorationContext)
       EXIT_EXPLORATION_CONTEXT -> ExplorationContext(activityName, exitExplorationContext)
       FINISH_EXPLORATION_CONTEXT -> ExplorationContext(activityName, finishExplorationContext)
       PROGRESS_SAVING_SUCCESS_CONTEXT ->
@@ -430,6 +432,7 @@ class EventBundleCreator @Inject constructor(
       value: ExplorationEventContext
     ) : EventActivityContext<ExplorationEventContext>(activityName, value) {
       override fun ExplorationEventContext.storeValue(store: PropertyStore) {
+        store.putNonSensitiveValue("classroom_id", classroomId)
         store.putNonSensitiveValue("topic_id", topicId)
         store.putNonSensitiveValue("story_id", storyId)
         store.putNonSensitiveValue("exploration_id", explorationId)
diff --git a/utility/src/main/java/org/oppia/android/util/logging/KenyaAlphaEventTypeToHumanReadableNameConverterImpl.kt b/utility/src/main/java/org/oppia/android/util/logging/KenyaAlphaEventTypeToHumanReadableNameConverterImpl.kt
index da3ad145a46..bb7e96e643b 100644
--- a/utility/src/main/java/org/oppia/android/util/logging/KenyaAlphaEventTypeToHumanReadableNameConverterImpl.kt
+++ b/utility/src/main/java/org/oppia/android/util/logging/KenyaAlphaEventTypeToHumanReadableNameConverterImpl.kt
@@ -38,6 +38,7 @@ class KenyaAlphaEventTypeToHumanReadableNameConverterImpl @Inject constructor()
       ActivityContextCase.PAUSE_VOICE_OVER_CONTEXT -> "pause_voice_over_context"
       ActivityContextCase.APP_IN_BACKGROUND_CONTEXT -> "app_in_background_context"
       ActivityContextCase.APP_IN_FOREGROUND_CONTEXT -> "app_in_foreground_context"
+      ActivityContextCase.START_EXPLORATION_CONTEXT -> "start_exploration_context"
       ActivityContextCase.EXIT_EXPLORATION_CONTEXT -> "exit_exploration_context"
       ActivityContextCase.FINISH_EXPLORATION_CONTEXT -> "finish_exploration_context"
       ActivityContextCase.PROGRESS_SAVING_SUCCESS_CONTEXT -> "progress_saving_success_context"
diff --git a/utility/src/main/java/org/oppia/android/util/logging/StandardEventTypeToHumanReadableNameConverterImpl.kt b/utility/src/main/java/org/oppia/android/util/logging/StandardEventTypeToHumanReadableNameConverterImpl.kt
index 2c4e72c10bf..315c28c5f3f 100644
--- a/utility/src/main/java/org/oppia/android/util/logging/StandardEventTypeToHumanReadableNameConverterImpl.kt
+++ b/utility/src/main/java/org/oppia/android/util/logging/StandardEventTypeToHumanReadableNameConverterImpl.kt
@@ -48,6 +48,7 @@ class StandardEventTypeToHumanReadableNameConverterImpl @Inject constructor() :
       ActivityContextCase.PAUSE_VOICE_OVER_CONTEXT -> "click_pause_voiceover_button"
       ActivityContextCase.APP_IN_BACKGROUND_CONTEXT -> "send_app_to_background"
       ActivityContextCase.APP_IN_FOREGROUND_CONTEXT -> "bring_app_to_foreground"
+      ActivityContextCase.START_EXPLORATION_CONTEXT -> "start_exploration_context"
       ActivityContextCase.EXIT_EXPLORATION_CONTEXT -> "leave_exploration"
       ActivityContextCase.FINISH_EXPLORATION_CONTEXT -> "complete_exploration"
       ActivityContextCase.PROGRESS_SAVING_SUCCESS_CONTEXT -> "progress_saving_success"
diff --git a/utility/src/test/java/org/oppia/android/util/logging/EventBundleCreatorTest.kt b/utility/src/test/java/org/oppia/android/util/logging/EventBundleCreatorTest.kt
index 92c45550bd0..7a285e8626c 100644
--- a/utility/src/test/java/org/oppia/android/util/logging/EventBundleCreatorTest.kt
+++ b/utility/src/test/java/org/oppia/android/util/logging/EventBundleCreatorTest.kt
@@ -123,6 +123,7 @@ class EventBundleCreatorTest {
   private companion object {
     private const val TEST_TIMESTAMP_1 = 1556094120000
     private const val TEST_TIMESTAMP_2 = 1234567898765
+    private const val TEST_CLASSROOM_ID = "test_classroom_id"
     private const val TEST_TOPIC_ID = "test_topic_id"
     private const val TEST_STORY_ID = "test_story_id"
     private const val TEST_EXPLORATION_ID = "test_exploration_id"
@@ -565,13 +566,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("open_exploration_player_screen")
-    assertThat(bundle).hasSize(17)
+    assertThat(bundle).hasSize(18)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(OPEN_EXPLORATION_ACTIVITY.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -589,13 +591,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("open_exploration_player_screen")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(OPEN_EXPLORATION_ACTIVITY.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -953,13 +956,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("start_exploration_card")
-    assertThat(bundle).hasSize(18)
+    assertThat(bundle).hasSize(19)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(START_CARD_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -978,13 +982,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("start_exploration_card")
-    assertThat(bundle).hasSize(20)
+    assertThat(bundle).hasSize(21)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(START_CARD_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1005,13 +1010,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("end_exploration_card")
-    assertThat(bundle).hasSize(18)
+    assertThat(bundle).hasSize(19)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(END_CARD_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1030,13 +1036,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("end_exploration_card")
-    assertThat(bundle).hasSize(20)
+    assertThat(bundle).hasSize(21)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(END_CARD_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1057,13 +1064,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("unlock_hint")
-    assertThat(bundle).hasSize(18)
+    assertThat(bundle).hasSize(19)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(HINT_UNLOCKED_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1082,13 +1090,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("unlock_hint")
-    assertThat(bundle).hasSize(20)
+    assertThat(bundle).hasSize(21)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(HINT_UNLOCKED_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1109,13 +1118,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("reveal_hint")
-    assertThat(bundle).hasSize(18)
+    assertThat(bundle).hasSize(19)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(REVEAL_HINT_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1134,7 +1144,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("reveal_hint")
-    assertThat(bundle).hasSize(20)
+    assertThat(bundle).hasSize(21)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(REVEAL_HINT_CONTEXT.number)
@@ -1161,13 +1171,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("view_existing_hint")
-    assertThat(bundle).hasSize(18)
+    assertThat(bundle).hasSize(19)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(VIEW_EXISTING_HINT_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1186,13 +1197,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("view_existing_hint")
-    assertThat(bundle).hasSize(20)
+    assertThat(bundle).hasSize(21)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(VIEW_EXISTING_HINT_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1213,13 +1225,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("unlock_solution")
-    assertThat(bundle).hasSize(17)
+    assertThat(bundle).hasSize(18)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(SOLUTION_UNLOCKED_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1237,13 +1250,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("unlock_solution")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(SOLUTION_UNLOCKED_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1263,13 +1277,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("reveal_solution")
-    assertThat(bundle).hasSize(17)
+    assertThat(bundle).hasSize(18)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(REVEAL_SOLUTION_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1287,7 +1302,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("reveal_solution")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(REVEAL_SOLUTION_CONTEXT.number)
@@ -1313,13 +1328,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("view_existing_solution")
-    assertThat(bundle).hasSize(17)
+    assertThat(bundle).hasSize(18)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(VIEW_EXISTING_SOLUTION_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1337,13 +1353,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("view_existing_solution")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(VIEW_EXISTING_SOLUTION_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1363,13 +1380,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("submit_answer")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(SUBMIT_ANSWER_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1389,13 +1407,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("submit_answer")
-    assertThat(bundle).hasSize(21)
+    assertThat(bundle).hasSize(22)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(SUBMIT_ANSWER_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1417,13 +1436,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("click_play_voiceover_button")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(PLAY_VOICE_OVER_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1443,13 +1463,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("click_play_voiceover_button")
-    assertThat(bundle).hasSize(21)
+    assertThat(bundle).hasSize(22)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(PLAY_VOICE_OVER_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1471,13 +1492,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("click_pause_voiceover_button")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(PAUSE_VOICE_OVER_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1497,13 +1519,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("click_pause_voiceover_button")
-    assertThat(bundle).hasSize(21)
+    assertThat(bundle).hasSize(22)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(PAUSE_VOICE_OVER_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1601,13 +1624,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("leave_exploration")
-    assertThat(bundle).hasSize(17)
+    assertThat(bundle).hasSize(18)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(EXIT_EXPLORATION_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1625,13 +1649,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("leave_exploration")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(EXIT_EXPLORATION_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1651,13 +1676,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("complete_exploration")
-    assertThat(bundle).hasSize(17)
+    assertThat(bundle).hasSize(18)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(FINISH_EXPLORATION_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1675,13 +1701,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("complete_exploration")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(FINISH_EXPLORATION_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1851,13 +1878,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("reach_invested_engagement")
-    assertThat(bundle).hasSize(17)
+    assertThat(bundle).hasSize(18)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(REACH_INVESTED_ENGAGEMENT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1875,13 +1903,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("reach_invested_engagement")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(REACH_INVESTED_ENGAGEMENT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1901,13 +1930,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("click_switch_language_in_lesson")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(SWITCH_IN_LESSON_LANGUAGE.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1927,13 +1957,14 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("click_switch_language_in_lesson")
-    assertThat(bundle).hasSize(21)
+    assertThat(bundle).hasSize(22)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(SWITCH_IN_LESSON_LANGUAGE.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -2296,6 +2327,7 @@ class EventBundleCreatorTest {
   ) = EventLog.Context.newBuilder().setter(value).build()
 
   private fun createExplorationContext(
+    classroomId: String = TEST_CLASSROOM_ID,
     topicId: String = TEST_TOPIC_ID,
     storyId: String = TEST_STORY_ID,
     explorationId: String = TEST_EXPLORATION_ID,
@@ -2304,6 +2336,7 @@ class EventBundleCreatorTest {
     stateName: String = TEST_STATE_NAME,
     learnerDetails: LearnerDetailsContext = createLearnerDetailsContext()
   ) = ExplorationContext.newBuilder().apply {
+    this.classroomId = classroomId
     this.topicId = topicId
     this.storyId = storyId
     this.explorationId = explorationId
diff --git a/utility/src/test/java/org/oppia/android/util/logging/KenyaAlphaEventBundleCreatorTest.kt b/utility/src/test/java/org/oppia/android/util/logging/KenyaAlphaEventBundleCreatorTest.kt
index 4799ce8baca..517e4e1ffc1 100644
--- a/utility/src/test/java/org/oppia/android/util/logging/KenyaAlphaEventBundleCreatorTest.kt
+++ b/utility/src/test/java/org/oppia/android/util/logging/KenyaAlphaEventBundleCreatorTest.kt
@@ -94,6 +94,7 @@ class KenyaAlphaEventBundleCreatorTest {
   private companion object {
     private const val TEST_TIMESTAMP_1 = 1556094120000
     private const val TEST_TIMESTAMP_2 = 1234567898765
+    private const val TEST_CLASSROOM_ID = "test_classroom_id"
     private const val TEST_TOPIC_ID = "test_topic_id"
     private const val TEST_STORY_ID = "test_story_id"
     private const val TEST_EXPLORATION_ID = "test_exploration_id"
@@ -192,13 +193,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("open_exploration_activity")
-    assertThat(bundle).hasSize(17)
+    assertThat(bundle).hasSize(18)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(OPEN_EXPLORATION_ACTIVITY.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -216,13 +218,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("open_exploration_activity")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(OPEN_EXPLORATION_ACTIVITY.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -417,13 +420,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("start_card_context")
-    assertThat(bundle).hasSize(18)
+    assertThat(bundle).hasSize(19)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(START_CARD_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -442,13 +446,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("start_card_context")
-    assertThat(bundle).hasSize(20)
+    assertThat(bundle).hasSize(21)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(START_CARD_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -469,13 +474,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("end_card_context")
-    assertThat(bundle).hasSize(18)
+    assertThat(bundle).hasSize(19)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(END_CARD_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -494,13 +500,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("end_card_context")
-    assertThat(bundle).hasSize(20)
+    assertThat(bundle).hasSize(21)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(END_CARD_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -521,13 +528,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("hint_offered_context")
-    assertThat(bundle).hasSize(18)
+    assertThat(bundle).hasSize(19)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(HINT_UNLOCKED_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -546,13 +554,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("hint_offered_context")
-    assertThat(bundle).hasSize(20)
+    assertThat(bundle).hasSize(21)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(HINT_UNLOCKED_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -573,13 +582,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("reveal_hint_context")
-    assertThat(bundle).hasSize(18)
+    assertThat(bundle).hasSize(19)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(REVEAL_HINT_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -598,13 +608,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("reveal_hint_context")
-    assertThat(bundle).hasSize(20)
+    assertThat(bundle).hasSize(21)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(REVEAL_HINT_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -625,13 +636,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("view_existing_hint_context")
-    assertThat(bundle).hasSize(18)
+    assertThat(bundle).hasSize(19)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(VIEW_EXISTING_HINT_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -650,13 +662,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("view_existing_hint_context")
-    assertThat(bundle).hasSize(20)
+    assertThat(bundle).hasSize(21)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(VIEW_EXISTING_HINT_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -677,13 +690,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("solution_offered_context")
-    assertThat(bundle).hasSize(17)
+    assertThat(bundle).hasSize(18)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(SOLUTION_UNLOCKED_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -701,13 +715,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("solution_offered_context")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(SOLUTION_UNLOCKED_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -727,13 +742,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("reveal_solution_context")
-    assertThat(bundle).hasSize(17)
+    assertThat(bundle).hasSize(18)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(REVEAL_SOLUTION_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -751,13 +767,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("reveal_solution_context")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(REVEAL_SOLUTION_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -777,13 +794,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("view_existing_solution_context")
-    assertThat(bundle).hasSize(17)
+    assertThat(bundle).hasSize(18)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(VIEW_EXISTING_SOLUTION_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -801,13 +819,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("view_existing_solution_context")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(VIEW_EXISTING_SOLUTION_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -827,13 +846,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("submit_answer_context")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(SUBMIT_ANSWER_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -853,13 +873,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("submit_answer_context")
-    assertThat(bundle).hasSize(21)
+    assertThat(bundle).hasSize(22)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(SUBMIT_ANSWER_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -881,13 +902,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("play_voice_over_context")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(PLAY_VOICE_OVER_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -907,13 +929,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("play_voice_over_context")
-    assertThat(bundle).hasSize(21)
+    assertThat(bundle).hasSize(22)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(PLAY_VOICE_OVER_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -935,13 +958,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("pause_voice_over_context")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(PAUSE_VOICE_OVER_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -961,13 +985,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("pause_voice_over_context")
-    assertThat(bundle).hasSize(21)
+    assertThat(bundle).hasSize(22)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(PAUSE_VOICE_OVER_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1065,13 +1090,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("exit_exploration_context")
-    assertThat(bundle).hasSize(17)
+    assertThat(bundle).hasSize(18)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(EXIT_EXPLORATION_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1089,13 +1115,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("exit_exploration_context")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(EXIT_EXPLORATION_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1115,13 +1142,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("finish_exploration_context")
-    assertThat(bundle).hasSize(17)
+    assertThat(bundle).hasSize(18)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(FINISH_EXPLORATION_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1139,13 +1167,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("finish_exploration_context")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(FINISH_EXPLORATION_CONTEXT.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1315,13 +1344,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("switch_in_lesson_language")
-    assertThat(bundle).hasSize(19)
+    assertThat(bundle).hasSize(20)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(SWITCH_IN_LESSON_LANGUAGE.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1341,13 +1371,14 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("switch_in_lesson_language")
-    assertThat(bundle).hasSize(21)
+    assertThat(bundle).hasSize(22)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(SWITCH_IN_LESSON_LANGUAGE.number)
     assertThat(bundle).integer("android_sdk").isEqualTo(TEST_ANDROID_SDK_VERSION)
     assertThat(bundle).string("app_version_name").isEqualTo(TEST_APP_VERSION_NAME)
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
+    assertThat(bundle).string("ed_classroom_id").isEqualTo(TEST_CLASSROOM_ID)
     assertThat(bundle).string("ed_topic_id").isEqualTo(TEST_TOPIC_ID)
     assertThat(bundle).string("ed_story_id").isEqualTo(TEST_STORY_ID)
     assertThat(bundle).string("ed_exploration_id").isEqualTo(TEST_EXPLORATION_ID)
@@ -1529,6 +1560,7 @@ class KenyaAlphaEventBundleCreatorTest {
   ) = EventLog.Context.newBuilder().setter(value).build()
 
   private fun createExplorationContext(
+    classroomId: String = TEST_CLASSROOM_ID,
     topicId: String = TEST_TOPIC_ID,
     storyId: String = TEST_STORY_ID,
     explorationId: String = TEST_EXPLORATION_ID,
@@ -1537,6 +1569,7 @@ class KenyaAlphaEventBundleCreatorTest {
     stateName: String = TEST_STATE_NAME,
     learnerDetails: LearnerDetailsContext = createLearnerDetailsContext()
   ) = ExplorationContext.newBuilder().apply {
+    this.classroomId = classroomId
     this.topicId = topicId
     this.storyId = storyId
     this.explorationId = explorationId