From b39e47d042ea60e6557461de241a2be5608d748e Mon Sep 17 00:00:00 2001
From: Ben Henning <ben@oppia.org>
Date: Thu, 16 Jun 2022 13:40:18 -0700
Subject: [PATCH 01/38] SW translation fixes + better UI.

This fixes a bunch of Swahili string bugs by stripping out unnecessary
prefixed whitespace.

This also introduces a fast language switch bar between English and
Swahili. It's not currently tested or gated behind a platform flag, but
both of these will be changed if the team decides to proceed with this
solution.
---
 .../player/state/StateFragmentPresenter.kt    |  16 +-
 .../app/player/state/StateViewModel.kt        | 102 +++++++-
 app/src/main/res/layout/state_fragment.xml    |  91 ++++---
 app/src/main/res/values-sw/strings.xml        | 240 +++++++++---------
 .../main/res/values/untranslated_strings.xml  |   3 +
 5 files changed, 286 insertions(+), 166 deletions(-)

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 f0d22cecad7..4382907bb81 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
@@ -33,7 +33,6 @@ import org.oppia.android.app.player.state.listener.RouteToHintsAndSolutionListen
 import org.oppia.android.app.player.stopplaying.StopStatePlayingSessionWithSavedProgressListener
 import org.oppia.android.app.topic.conceptcard.ConceptCardFragment.Companion.CONCEPT_CARD_DIALOG_FRAGMENT_TAG
 import org.oppia.android.app.utility.SplitScreenManager
-import org.oppia.android.app.viewmodel.ViewModelProvider
 import org.oppia.android.databinding.StateFragmentBinding
 import org.oppia.android.domain.exploration.ExplorationProgressController
 import org.oppia.android.domain.oppialogger.OppiaLogger
@@ -61,14 +60,14 @@ class StateFragmentPresenter @Inject constructor(
   private val activity: AppCompatActivity,
   private val fragment: Fragment,
   private val context: Context,
-  private val viewModelProvider: ViewModelProvider<StateViewModel>,
   private val explorationProgressController: ExplorationProgressController,
   private val storyProgressController: StoryProgressController,
   private val oppiaLogger: OppiaLogger,
   @DefaultResourceBucketName private val resourceBucketName: String,
   private val assemblerBuilderFactory: StatePlayerRecyclerViewAssembler.Builder.Factory,
   private val splitScreenManager: SplitScreenManager,
-  private val oppiaClock: OppiaClock
+  private val oppiaClock: OppiaClock,
+  private val viewModel: StateViewModel
 ) {
 
   private val routeToHintsAndSolutionListener = activity as RouteToHintsAndSolutionListener
@@ -84,9 +83,6 @@ class StateFragmentPresenter @Inject constructor(
   private lateinit var recyclerViewAdapter: RecyclerView.Adapter<*>
   private lateinit var helpIndex: HelpIndex
 
-  private val viewModel: StateViewModel by lazy {
-    getStateViewModel()
-  }
   private lateinit var recyclerViewAssembler: StatePlayerRecyclerViewAssembler
   private val ephemeralStateLiveData: LiveData<AsyncResult<EphemeralState>> by lazy {
     explorationProgressController.getCurrentState().toLiveData()
@@ -106,6 +102,7 @@ class StateFragmentPresenter @Inject constructor(
     this.topicId = topicId
     this.storyId = storyId
     this.explorationId = explorationId
+    viewModel.initializeProfile(profileId)
 
     binding = StateFragmentBinding.inflate(
       inflater,
@@ -256,10 +253,6 @@ class StateFragmentPresenter @Inject constructor(
     subscribeToHintSolution(explorationProgressController.submitSolutionIsRevealed())
   }
 
-  private fun getStateViewModel(): StateViewModel {
-    return viewModelProvider.getForFragment(fragment, StateViewModel::class.java)
-  }
-
   private fun getAudioFragment(): Fragment? {
     return fragment.childFragmentManager.findFragmentByTag(TAG_AUDIO_FRAGMENT)
   }
@@ -427,8 +420,7 @@ class StateFragmentPresenter @Inject constructor(
     )
   }
 
-  fun setAudioBarVisibility(visibility: Boolean) =
-    getStateViewModel().setAudioBarVisibility(visibility)
+  fun setAudioBarVisibility(visibility: Boolean) = viewModel.setAudioBarVisibility(visibility)
 
   fun scrollToTop() {
     binding.stateRecyclerView.smoothScrollToPosition(0)
diff --git a/app/src/main/java/org/oppia/android/app/player/state/StateViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/StateViewModel.kt
index a46208966b1..4739914eb82 100644
--- a/app/src/main/java/org/oppia/android/app/player/state/StateViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/player/state/StateViewModel.kt
@@ -2,19 +2,39 @@ package org.oppia.android.app.player.state
 
 import androidx.databinding.ObservableField
 import androidx.databinding.ObservableList
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.Observer
+import androidx.lifecycle.Transformations
 import androidx.lifecycle.ViewModel
 import org.oppia.android.app.fragment.FragmentScope
+import org.oppia.android.app.model.EphemeralState
+import org.oppia.android.app.model.OppiaLanguage
+import org.oppia.android.app.model.ProfileId
 import org.oppia.android.app.model.UserAnswer
+import org.oppia.android.app.model.WrittenTranslationLanguageSelection
 import org.oppia.android.app.player.state.answerhandling.AnswerErrorCategory
 import org.oppia.android.app.player.state.answerhandling.InteractionAnswerHandler
 import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel
 import org.oppia.android.app.viewmodel.ObservableArrayList
 import org.oppia.android.app.viewmodel.ObservableViewModel
+import org.oppia.android.domain.exploration.ExplorationProgressController
+import org.oppia.android.domain.oppialogger.OppiaLogger
+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 javax.inject.Inject
 
 /** [ViewModel] for state-fragment. */
 @FragmentScope
-class StateViewModel @Inject constructor() : ObservableViewModel() {
+class StateViewModel @Inject constructor(
+  private val explorationProgressController: ExplorationProgressController,
+  private val translationController: TranslationController,
+  private val machineLocale: OppiaLocale.MachineLocale,
+  private val oppiaLogger: OppiaLogger,
+  private val fragment: Fragment
+) : ObservableViewModel() {
   val itemList: ObservableList<StateItemViewModel> = ObservableArrayList()
   val rightItemList: ObservableList<StateItemViewModel> = ObservableArrayList()
 
@@ -26,9 +46,27 @@ class StateViewModel @Inject constructor() : ObservableViewModel() {
   val isHintBulbVisible = ObservableField(false)
   val isHintOpenedAndUnRevealed = ObservableField(false)
 
+  val hasSwahiliTranslations: LiveData<Boolean> by lazy {
+    Transformations.map(
+      explorationProgressController.getCurrentState().toLiveData(),
+      ::processWhetherSwahiliIsSupported
+    )
+  }
+  val hasEnabledSwahiliTranslations: LiveData<Boolean> by lazy {
+    Transformations.map(
+      translationController.getWrittenTranslationContentLanguage(profileId).toLiveData(),
+      ::processIsCurrentLanguageSwahili
+    )
+  }
+
   var currentStateName = ObservableField<String>(null as? String?)
 
   private val canSubmitAnswer = ObservableField(false)
+  private lateinit var profileId: ProfileId
+
+  fun initializeProfile(profileId: ProfileId) {
+    this.profileId = profileId
+  }
 
   fun setAudioBarVisibility(audioBarVisible: Boolean) {
     isAudioBarVisible.set(audioBarVisible)
@@ -56,6 +94,33 @@ class StateViewModel @Inject constructor() : ObservableViewModel() {
     ) ?: UserAnswer.getDefaultInstance()
   }
 
+  fun toggleContentLanguage(isSwahiliEnabled: Boolean) {
+    val languageSelection = WrittenTranslationLanguageSelection.newBuilder().apply {
+      selectedLanguage = if (isSwahiliEnabled) OppiaLanguage.ENGLISH else OppiaLanguage.SWAHILI
+    }.build()
+    val updateResultProvider =
+      translationController.updateWrittenTranslationContentLanguage(profileId, languageSelection)
+    val updateResultLiveData = updateResultProvider.toLiveData()
+    updateResultLiveData.observe(
+      fragment,
+      object : Observer<AsyncResult<Any>> {
+        override fun onChanged(result: AsyncResult<Any>?) {
+          if (result is AsyncResult.Failure) {
+            oppiaLogger.e(
+              "StateViewModel",
+              "Failed to update content language to:" +
+                " ${languageSelection.selectedLanguage.ordinal}.",
+              result.error
+            )
+          }
+          if (result !is AsyncResult.Pending) {
+            updateResultLiveData.removeObserver(this)
+          }
+        }
+      }
+    )
+  }
+
   private fun getPendingAnswerWithoutError(
     answerHandler: InteractionAnswerHandler?
   ): UserAnswer? {
@@ -73,4 +138,39 @@ class StateViewModel @Inject constructor() : ObservableViewModel() {
       itemList
     }
   }
+
+  private fun processIsCurrentLanguageSwahili(languageResult: AsyncResult<OppiaLanguage>): Boolean {
+    return when (languageResult) {
+      is AsyncResult.Pending -> false
+      is AsyncResult.Success -> languageResult.value == OppiaLanguage.SWAHILI
+      is AsyncResult.Failure -> {
+        oppiaLogger.e(
+          "StateViewModel", "Failed to retrieve content language.", languageResult.error
+        )
+        false
+      }
+    }
+  }
+
+  private fun processWhetherSwahiliIsSupported(stateResult: AsyncResult<EphemeralState>): Boolean {
+    return when (stateResult) {
+      is AsyncResult.Pending -> false
+      is AsyncResult.Success -> {
+        // It would be nice if there was a domain utility to do this if it's needed elsewhere (or,
+        // better yet, just using the language protos directly in the state structure so no raw language codes need to be processed).
+        val supportedLanguageCodes = stateResult.value.state.writtenTranslationsMap.values.flatMap {
+          it.translationMappingMap.keys
+        }.toSet()
+        supportedLanguageCodes.any {
+          machineLocale.run {
+            it.toMachineLowerCase() == "sw"
+          }
+        }
+      }
+      is AsyncResult.Failure -> {
+        oppiaLogger.e("StateViewModel", "Failed to retrieve state.", stateResult.error)
+        false
+      }
+    }
+  }
 }
diff --git a/app/src/main/res/layout/state_fragment.xml b/app/src/main/res/layout/state_fragment.xml
index eb122dac2a0..12b9df7bca8 100755
--- a/app/src/main/res/layout/state_fragment.xml
+++ b/app/src/main/res/layout/state_fragment.xml
@@ -100,47 +100,72 @@
       android:layout_height="match_parent" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
-      android:id="@+id/hints_and_solution_fragment_container"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:layout_gravity="bottom|start"
-      android:background="@color/audio_component_background"
-      android:visibility="@{viewModel.isHintBulbVisible() ? View.VISIBLE : View.GONE}">
+      android:layout_gravity="bottom|start">
 
-      <ImageView
-        android:id="@+id/hint_bulb"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="8dp"
-        android:contentDescription="@{viewModel.isHintOpenedAndUnRevealed() ? @string/new_hint_available : @string/no_new_hint_available}"
-        app:srcCompat="@{viewModel.isHintOpenedAndUnRevealed() ? @drawable/ic_hint_bulb_filled_yellow_48dp : @drawable/ic_hint_bulb_white_48dp}"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
-      <TextView
-        android:id="@+id/hint_bar_title"
-        android:layout_width="wrap_content"
+      <FrameLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:text="@string/hints_toolbar_title"
-        android:textSize="24sp"
-        android:textColor="@color/color_def_white"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/hint_bulb" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/hints_and_solution_fragment_container"
+        android:background="@color/color_palette_background_color"
+        android:visibility="@{viewModel.hasSwahiliTranslations ? View.VISIBLE : View.GONE}">
+        <androidx.appcompat.widget.AppCompatButton
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginStart="16dp"
+          android:minWidth="@dimen/clickable_item_min_height"
+          android:minHeight="@dimen/clickable_item_min_height"
+          android:text="@{viewModel.hasEnabledSwahiliTranslations ? @string/temporary_translate_to_english : @string/temporary_translate_to_swahili}"
+          android:onClick="@{(v) -> viewModel.toggleContentLanguage(viewModel.hasEnabledSwahiliTranslations)}" />
+      </FrameLayout>
 
-      <ImageView
-        android:id="@+id/open_hint_dialog_arrow"
-        android:layout_width="wrap_content"
+      <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/hints_and_solution_fragment_container"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="8dp"
-        android:contentDescription="@string/show_hints_and_solution"
-        app:srcCompat="@{viewModel.isHintOpenedAndUnRevealed() ? @drawable/ic_keyboard_arrow_down_white_48dp : @drawable/ic_keyboard_arrow_right_white_48}"
-        app:layout_constraintTop_toTopOf="parent"
+        android:layout_gravity="bottom|start"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        android:background="@color/audio_component_background"
+        android:visibility="@{viewModel.isHintBulbVisible() ? View.VISIBLE : View.GONE}">
 
+        <ImageView
+          android:id="@+id/hint_bulb"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_margin="8dp"
+          android:contentDescription="@{viewModel.isHintOpenedAndUnRevealed() ? @string/new_hint_available : @string/no_new_hint_available}"
+          app:srcCompat="@{viewModel.isHintOpenedAndUnRevealed() ? @drawable/ic_hint_bulb_filled_yellow_48dp : @drawable/ic_hint_bulb_white_48dp}"
+          app:layout_constraintTop_toTopOf="parent"
+          app:layout_constraintBottom_toBottomOf="parent"
+          app:layout_constraintStart_toStartOf="parent" />
+
+        <TextView
+          android:id="@+id/hint_bar_title"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginStart="16dp"
+          android:text="@string/hints_toolbar_title"
+          android:textSize="24sp"
+          android:textColor="@color/color_def_white"
+          app:layout_constraintTop_toTopOf="parent"
+          app:layout_constraintBottom_toBottomOf="parent"
+          app:layout_constraintStart_toEndOf="@+id/hint_bulb" />
+
+        <ImageView
+          android:id="@+id/open_hint_dialog_arrow"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_margin="8dp"
+          android:contentDescription="@string/show_hints_and_solution"
+          app:srcCompat="@{viewModel.isHintOpenedAndUnRevealed() ? @drawable/ic_keyboard_arrow_down_white_48dp : @drawable/ic_keyboard_arrow_right_white_48}"
+          app:layout_constraintTop_toTopOf="parent"
+          app:layout_constraintBottom_toBottomOf="parent"
+          app:layout_constraintEnd_toEndOf="parent" />
+
+      </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <FrameLayout
diff --git a/app/src/main/res/values-sw/strings.xml b/app/src/main/res/values-sw/strings.xml
index df47a1192c2..966b18772d1 100644
--- a/app/src/main/res/values-sw/strings.xml
+++ b/app/src/main/res/values-sw/strings.xml
@@ -109,15 +109,15 @@
   <string name="math_expression_error_exponent_has_variable">Samahani,vipeo vingi havitumiki na programu.Tafadhali rekebisha jibu lako.</string>
   <string name="math_expression_error_exponent_too_large">Samahani, nguvu za juu zaidi ya 5 haiungwi mkono na programu. Tafadhali rekebisha jibu lako.</string>
   <string name="math_expression_error_nested_exponent">Samahani, nguvu zinazorudiwa/vielezo hazihimiliwi na programu. Tafadhali punguza jibu lako kwa nguvu moja.</string>
-  <string name="math_expression_error_hanging_square_root">\nPembejeo haipo kwa mzizi wa mraba.</string>
-  <string name="math_expression_error_term_divided_by_zero">\nKugawanya kwa sufuri si halali. Tafadhali rekebisha jibu lako.</string>
+  <string name="math_expression_error_hanging_square_root">Pembejeo haipo kwa mzizi wa mraba.</string>
+  <string name="math_expression_error_term_divided_by_zero">Kugawanya kwa sufuri si halali. Tafadhali rekebisha jibu lako.</string>
   <string name="math_expression_error_variable_in_numeric_expression">Inaonekana umeingiza baadhi ya vigezo. Tafadhali hakikisha kuwa jibu lako lina nambari pekee na uondoe vigezo vyovyote kutoka kwa jibu lako.</string>
-  <string name="math_expression_error_invalid_variable">\nTafadhali tumia vigezo vilivyobainishwa katika swali na si %s.</string>
+  <string name="math_expression_error_invalid_variable">Tafadhali tumia vigezo vilivyobainishwa katika swali na si %s.</string>
   <string name="math_expression_error_missing_equals">Mlinganyo yako inakosa ishara \'=\'.</string>
-  <string name="math_expression_error_more_than_one_equals">\nMlinganyo wako una ishara nyingi sana \'=\'. Inapaswa kuwa na moja tu.</string>
-  <string name="math_expression_error_hanging_equals">\nMoja ya pande za \'=\' katika mlinganyo wako ni tupu.</string>
-  <string name="math_expression_error_unsupported_function">\nChaguo la kukokotoa \'%s\' haitumiki. Tafadhali rekebisha jibu lako.</string>
-  <string name="math_expression_error_incomplete_function_name">\nUlimaanisha sqrt? Ikiwa sivyo, tafadhali tenganisha vigeu kwa kutumia alama za kuzidisha.</string>
+  <string name="math_expression_error_more_than_one_equals">Mlinganyo wako una ishara nyingi sana \'=\'. Inapaswa kuwa na moja tu.</string>
+  <string name="math_expression_error_hanging_equals">Moja ya pande za \'=\' katika mlinganyo wako ni tupu.</string>
+  <string name="math_expression_error_unsupported_function">Chaguo la kukokotoa \'%s\' haitumiki. Tafadhali rekebisha jibu lako.</string>
+  <string name="math_expression_error_incomplete_function_name">Ulimaanisha sqrt? Ikiwa sivyo, tafadhali tenganisha vigeu kwa kutumia alama za kuzidisha.</string>
   <string name="math_expression_error_generic">Samahani, hatukuweza kuelewa jibu lako. Tafadhali iangalie ili kuhakikisha kuwa hakuna hitilafu zozote.</string>
   <string name="enable_audio_playback_content_description">Washa sauti kwa somo hili.</string>
   <string name="recently_played_stories">Hadithi Zilizochezwa hivi karibuni</string>
@@ -158,126 +158,126 @@
   <string name="ratio_error_invalid_colons">Jibu lako lina koloni mbili (:) karibu na kila moja.</string>
   <string name="ratio_error_invalid_size">Idadi ya masharti si sawa na masharti yanayohitajika.</string>
   <string name="ratio_error_includes_zero">Uwiano hauwezi kuwa na 0 kama kipengele.</string>
-  <string name="unknown_size">\nUkubwa usiojulikana</string>
-  <string name="size_bytes">\n Baiti %s</string>
+  <string name="unknown_size">Ukubwa usiojulikana</string>
+  <string name="size_bytes">Baiti %s</string>
   <string name="size_kb">%s KB</string>
   <string name="size_mb">%s MB</string>
   <string name="size_gb">%s GB</string>
-  <string name="correct">\nSahihi!</string>
-  <string name="topic_prefix">\nMada: %s</string>
-  <string name="chapter_count_with_story_name">\n%1$s katika %2$s</string>
+  <string name="correct">Sahihi!</string>
+  <string name="topic_prefix">Mada: %s</string>
+  <string name="chapter_count_with_story_name">%1$s katika %2$s</string>
   <plurals name="chapter_count">
     <item quantity="one">Sura 1\n    </item>
-    <item quantity="other">\n\n      Sura %s \n    </item>
+    <item quantity="other">Sura %s \n    </item>
   </plurals>
   <plurals name="story_count">
     <item quantity="one">Hadithi 1\n    </item>
-    <item quantity="other">\n      Hadithi %s\n    </item>
+    <item quantity="other">Hadithi %s\n    </item>
   </plurals>
   <plurals name="story_total_chapters">
     <item quantity="one">%s kati ya Sura %s Imekamilika</item>
-    <item quantity="other"> %s ya Sura %s Imekamilika</item>
+    <item quantity="other">%s ya Sura %s Imekamilika</item>
   </plurals>
   <plurals name="lesson_count">
     <item quantity="one">Somo 1\n    </item>
-    <item quantity="other">\n      Masomo %s \n    </item>
+    <item quantity="other">Masomo %s \n    </item>
   </plurals>
-  <string name="profile_chooser_activity_label">\nUkurasa wa kuchagua wasifu</string>
-  <string name="profile_chooser_admin">\nMsimamizi</string>
-  <string name="profile_chooser_select">\nChagua wasifu wako</string>
-  <string name="profile_chooser_add">\nOngeza Wasifu</string>
+  <string name="profile_chooser_activity_label">Ukurasa wa kuchagua wasifu</string>
+  <string name="profile_chooser_admin">Msimamizi</string>
+  <string name="profile_chooser_select">Chagua wasifu wako</string>
+  <string name="profile_chooser_add">Ongeza Wasifu</string>
   <string name="set_up_multiple_profiles">Weka Wasifu Nyingi</string>
-  <string name="set_up_multiple_profiles_description">\nOngeza hadi watumiaji 10 kwenye akaunti yako. Nzuri sana kwa familia na madarasa.</string>
-  <string name="profile_chooser_administrator_controls">\nUdhibiti vya Msimamizi</string>
+  <string name="set_up_multiple_profiles_description">Ongeza hadi watumiaji 10 kwenye akaunti yako. Nzuri sana kwa familia na madarasa.</string>
+  <string name="profile_chooser_administrator_controls">Udhibiti vya Msimamizi</string>
   <string name="profile_chooser_language">Lugha</string>
   <string name="admin_auth_toolbar">Vidhibiti vya Msimamizi</string>
-  <string name="admin_auth_activity_add_profiles_title">\nIdhinisha kuongeza wasifu</string>
+  <string name="admin_auth_activity_add_profiles_title">Idhinisha kuongeza wasifu</string>
   <string name="admin_auth_activity_access_controls_title">Idhinisha kufikia Vidhibiti vya Msimamizi</string>
-  <string name="admin_auth_heading">\nIdhini ya Msimamizi Inahitajika</string>
+  <string name="admin_auth_heading">Idhini ya Msimamizi Inahitajika</string>
   <string name="admin_auth_sub">Weka Nambari ya Siri ya Msimamizi ili kuunda akaunti mpya.</string>
   <string name="admin_auth_admin_controls_sub">Weka Nambari ya Siri ya Msimamizi ili kufikia Vidhibiti vya Msimamizi.</string>
-  <string name="admin_auth_pin">\nNambari ya Siri ya Msimamizi</string>
+  <string name="admin_auth_pin">Nambari ya Siri ya Msimamizi</string>
   <string name="admin_auth_incorrect">Nambari ya Siri ya Msimamizi si Sahihi. Tafadhali jaribu tena.</string>
-  <string name="admin_auth_null">\nTafadhali weka Nambari ya Siri ya Msimamizi.</string>
-  <string name="admin_auth_submit">\nWasilisha</string>
+  <string name="admin_auth_null">Tafadhali weka Nambari ya Siri ya Msimamizi.</string>
+  <string name="admin_auth_submit">Wasilisha</string>
   <string name="admin_auth_close">Funga</string>
-  <string name="admin_pin_requirement_description">\nKabla ya kuongeza wasifu, tunahitaji kulinda akaunti yako kwa kuunda Nambari ya Siri. Hii hukupa uwezo wa kuidhinisha upakuaji na kudhibiti wasifu kwenye kifaa.</string>
-  <string name="admin_pin_pin_description">\nTumia Nambari yako ya siri uliyoweka kwa akaunti za kibinafsi kama vile benki au usalama wa kijamii.</string>
-  <string name="admin_pin_new_pin">\nNambari mpya ya Siri ya tarakimu 5</string>
+  <string name="admin_pin_requirement_description">Kabla ya kuongeza wasifu, tunahitaji kulinda akaunti yako kwa kuunda Nambari ya Siri. Hii hukupa uwezo wa kuidhinisha upakuaji na kudhibiti wasifu kwenye kifaa.</string>
+  <string name="admin_pin_pin_description">Tumia Nambari yako ya siri uliyoweka kwa akaunti za kibinafsi kama vile benki au usalama wa kijamii.</string>
+  <string name="admin_pin_new_pin">Nambari mpya ya Siri ya tarakimu 5</string>
   <string name="admin_pin_new_confirm">Thibitisha Nambari ya Siri ya tarakimu 5</string>
-  <string name="admin_pin_error_pin_length">\nNambari yako ya Siri inapaswa kuwa na urefu wa tarakimu 5.</string>
-  <string name="admin_pin_error_pin_confirm_wrong">\nTafadhali hakikisha kwamba Nambari za Siri zote mbili zinalingana.</string>
+  <string name="admin_pin_error_pin_length">Nambari yako ya Siri inapaswa kuwa na urefu wa tarakimu 5.</string>
+  <string name="admin_pin_error_pin_confirm_wrong">Tafadhali hakikisha kwamba Nambari za Siri zote mbili zinalingana.</string>
   <string name="save">Hifadhi</string>
-  <string name="admin_pin_activity_title">\nIdhinisha kuongeza wasifu</string>
-  <string name="add_profile_activity_label">\nOngeza Wasifu</string>
-  <string name="add_profile_title">\nOngeza Wasifu</string>
+  <string name="admin_pin_activity_title">Idhinisha kuongeza wasifu</string>
+  <string name="add_profile_activity_label">Ongeza Wasifu</string>
+  <string name="add_profile_title">Ongeza Wasifu</string>
   <string name="add_profile_input_name">Jina*</string>
-  <string name="add_profile_input_pin">\nNambari ya Siri ya tarakimu 3*</string>
+  <string name="add_profile_input_pin">Nambari ya Siri ya tarakimu 3*</string>
   <string name="add_profile_input_confirm_pin">Thibitisha Nambari ya Siri ya tarakimu 3*</string>
-  <string name="add_profile_allow_download_heading">\nRuhusu Upakuaji wa Ufikiaji</string>
-  <string name="add_profile_allow_download_sub">\nMtumiaji anaweza kupakua na kufuta maudhui bila Nambari ya Siri ya Msimamizi.</string>
+  <string name="add_profile_allow_download_heading">Ruhusu Upakuaji wa Ufikiaji</string>
+  <string name="add_profile_allow_download_sub">Mtumiaji anaweza kupakua na kufuta maudhui bila Nambari ya Siri ya Msimamizi.</string>
   <string name="add_profile_create_btn">Anzisha</string>
   <string name="add_profile_close">Funga</string>
-  <string name="add_profile_pin_info">\nUkiwa na Nambari ya Siri, hakuna mtu mwingine anayeweza kufikia wasifu kando na mtumiaji huyu aliyekabidhiwa.</string>
-  <string name="add_profile_error_image_failed_store">\nTumeshindwa kuhifadhi picha yako. Tafadhali jaribu tena.</string>
+  <string name="add_profile_pin_info">Ukiwa na Nambari ya Siri, hakuna mtu mwingine anayeweza kufikia wasifu kando na mtumiaji huyu aliyekabidhiwa.</string>
+  <string name="add_profile_error_image_failed_store">Tumeshindwa kuhifadhi picha yako. Tafadhali jaribu tena.</string>
   <string name="add_profile_error_name_not_unique">Jina hili tayari linatumiwa na wasifu mwingine.</string>
   <string name="add_profile_error_name_empty">Tafadhali weka jina la wasifu huu.</string>
-  <string name="add_profile_error_name_only_letters">\nMajina yanaweza kuwa na herufi pekee. Jaribu jina lingine?</string>
-  <string name="add_profile_error_pin_length">\nNambari yako ya Siri inapaswa kuwa na urefu wa tarakimu 3.</string>
-  <string name="add_profile_error_pin_confirm_wrong">\nTafadhali hakikisha kwamba Nambari za Siri zote mbili zinalingana.</string>
-  <string name="add_profile_info_content_description">\nMaelezo zaidi kuhusu Nambari za Siri zenye tarakimu 3.</string>
-  <string name="required_fields_content_description">\nSehemu zilizo na alama ya * zinahitajika.</string>
+  <string name="add_profile_error_name_only_letters">Majina yanaweza kuwa na herufi pekee. Jaribu jina lingine?</string>
+  <string name="add_profile_error_pin_length">Nambari yako ya Siri inapaswa kuwa na urefu wa tarakimu 3.</string>
+  <string name="add_profile_error_pin_confirm_wrong">Tafadhali hakikisha kwamba Nambari za Siri zote mbili zinalingana.</string>
+  <string name="add_profile_info_content_description">Maelezo zaidi kuhusu Nambari za Siri zenye tarakimu 3.</string>
+  <string name="required_fields_content_description">Sehemu zilizo na alama ya * zinahitajika.</string>
   <string name="current_profile_picture_content_description">Picha ya sasa ya wasifu</string>
-  <string name="edit_profile_picture_content_description">\nHariri picha ya wasifu</string>
-  <string name="onboarding_slide_0_title">\nKaribu kwa %s!</string>
+  <string name="edit_profile_picture_content_description">Hariri picha ya wasifu</string>
+  <string name="onboarding_slide_0_title">Karibu kwa %s!</string>
   <string name="onboarding_slide_0_description">Jifunze chochote unachotaka kwa njia bora na ya kufurahisha.</string>
   <string name="onboarding_slide_1_title">Ongeza watumiaji kwenye akaunti yako.</string>
   <string name="onboarding_slide_1_description">Elezea uzoefu na uunde hadi wasifu 10.</string>
-  <string name="onboarding_slide_2_title">\nPakua ya nje ya mtandao.</string>
+  <string name="onboarding_slide_2_title">Pakua ya nje ya mtandao.</string>
   <string name="onboarding_slide_2_description">Endelea kujifunza masomo yako bila muunganisho wa mtandao.</string>
-  <string name="onboarding_slide_3_title">\nFurahia!</string>
+  <string name="onboarding_slide_3_title">Furahia!</string>
   <string name="onboarding_slide_3_description">Furahia matukio yako ya kujifunza kwa masomo yetu ya bure na ya ufanisi.</string>
   <string name="skip">Ruka</string>
   <string name="next_arrow">Inayofuata</string>
   <string name="get_started">Anza</string>
-  <string name="onboarding_slide_dots_content_description">\nSlaidi %s ya %s</string>
-  <string name="pin_password_hello">\nHabari, %s!</string>
+  <string name="onboarding_slide_dots_content_description">Slaidi %s ya %s</string>
+  <string name="pin_password_hello">Habari, %s!</string>
   <string name="pin_password_admin_enter">Tafadhali weka Nambari yako ya Siri ya Msimamizi.</string>
-  <string name="pin_password_user_enter">\nTafadhali weka Nambari yako ya Siri.</string>
-  <string name="input_pin_password_as_admin">\nNambari ya Siri ya Tarakimu 5 ya Msimamizi.</string>
-  <string name="input_pin_password_as_user">\nNambari ya Siri ya Tarakimu 3 ya Mtumiaji.</string>
+  <string name="pin_password_user_enter">Tafadhali weka Nambari yako ya Siri.</string>
+  <string name="input_pin_password_as_admin">Nambari ya Siri ya Tarakimu 5 ya Msimamizi.</string>
+  <string name="input_pin_password_as_user">Nambari ya Siri ya Tarakimu 3 ya Mtumiaji.</string>
   <string name="pin_password_forgot_pin">Nilisahau nambari yangu.</string>
   <string name="pin_password_incorrect_pin">Nambari ya Siri si sahihi.</string>
   <string name="pin_password_show">Onyesha</string>
   <string name="pin_password_hide">ficha</string>
   <string name="pin_password_close">Funga</string>
-  <string name="pin_password_success">\nMabadiliko ya Nambari ya Siri yamefaulu</string>
+  <string name="pin_password_success">Mabadiliko ya Nambari ya Siri yamefaulu</string>
   <string name="pin_password_forgot_title">Je, umesahau Nambari ya Siri?</string>
   <string name="pin_password_forgot_message">Ili kuweka upya Nambari yako ya Siri, tafadhali ondoa %s kisha uisakinishe upya.\n\nKumbuka kwamba ikiwa kifaa hakijakuwa mtandaoni, unaweza kupoteza maendeleo ya mtumiaji kwenye akaunti nyingi.</string>
   <string name="pin_password_play_store">Nenda kwenye hifadhi ya Google play.</string>
-  <string name="show_hide_password_icon">\nOnyesha/Ficha ishara ya nenosiri</string>
-  <string name="password_shown_icon">\nIshara ya nenosiri iliyoonyeshwa</string>
-  <string name="password_hidden_icon">\nIshara ya nenosiri iliyofichwa</string>
-  <string name="enter_your_pin">\nWeka Nambari yako ya Siri</string>
-  <string name="pin_password_toolbar_title">\nWeka Nambari ya Siri</string>
+  <string name="show_hide_password_icon">Onyesha/Ficha ishara ya nenosiri</string>
+  <string name="password_shown_icon">Ishara ya nenosiri iliyoonyeshwa</string>
+  <string name="password_hidden_icon">Ishara ya nenosiri iliyofichwa</string>
+  <string name="enter_your_pin">Weka Nambari yako ya Siri</string>
+  <string name="pin_password_toolbar_title">Weka Nambari ya Siri</string>
   <string name="admin_settings_label">Nambari ya Siri ya Msimamizi</string>
   <string name="admin_settings_heading">Ufikiaji wa mipangilio ya msimamizi</string>
-  <string name="admin_settings_sub">\nNambari ya Siri ya Msimamizi inahitajika ili kubadilisha Nambari ya Siri ya mtumiaji</string>
+  <string name="admin_settings_sub">Nambari ya Siri ya Msimamizi inahitajika ili kubadilisha Nambari ya Siri ya mtumiaji</string>
   <string name="admin_settings_cancel">Ghairi</string>
   <string name="admin_settings_submit">Wasilisha</string>
   <string name="admin_settings_incorrect">Nambari ya Siri ya msimamizi si Sahihi. Tafadhali jaribu tena.</string>
-  <string name="admin_settings_enter_user_new_pin">\nNambari ya Siri mpya ya %1$s.</string>
-  <string name="reset_pin_enter">\nWeka Nambari mpya ya Siri</string>
-  <string name="my_downloads_activity_title">\nVipakuliwa Vyangu</string>
-  <string name="tab_downloads">\nVipakuliwa</string>
+  <string name="admin_settings_enter_user_new_pin">Nambari ya Siri mpya ya %1$s.</string>
+  <string name="reset_pin_enter">Weka Nambari mpya ya Siri</string>
+  <string name="my_downloads_activity_title">Vipakuliwa Vyangu</string>
+  <string name="tab_downloads">Vipakuliwa</string>
   <string name="tab_updates">Sasisho (2)</string>
   <string name="home_activity_back_dialog_message">Je, ungependa kuondoka kwenye wasifu wako?</string>
   <string name="home_activity_back_dialog_cancel">Ghairi</string>
   <string name="home_activity_back_dialog_exit">Toka</string>
   <string name="home_activity_title">Mwanzo</string>
-  <string name="profile_list_activity_title">\nWasifu</string>
+  <string name="profile_list_activity_title">Wasifu</string>
   <string name="profile_edit_created">Ilitengenezwa kwa %s</string>
-  <string name="profile_last_used">\nMara ya mwisho kutumika</string>
+  <string name="profile_last_used">Mara ya mwisho kutumika</string>
   <string name="profile_edit_rename">Badilisha jina</string>
   <string name="profile_edit_reset">Weka upya Nambari ya Siri</string>
   <string name="profile_edit_delete">Ufutaji wa Wasifu</string>
@@ -285,8 +285,8 @@
   <string name="profile_edit_delete_dialog_message">Maendeleo yote yatafutwa na hayawezi kurejeshwa.</string>
   <string name="profile_edit_delete_dialog_positive">Futa</string>
   <string name="profile_edit_delete_dialog_negative">Ghairi</string>
-  <string name="profile_edit_allow_download_heading">\nRuhusu Ufikiaji wa Upakuaji</string>
-  <string name="profile_edit_allow_download_sub">\nMtumiaji anaweza kupakua na kufuta maudhui bila Nambari ya Siri ya msimamizi.</string>
+  <string name="profile_edit_allow_download_heading">Ruhusu Ufikiaji wa Upakuaji</string>
+  <string name="profile_edit_allow_download_sub">Mtumiaji anaweza kupakua na kufuta maudhui bila Nambari ya Siri ya msimamizi.</string>
   <string name="profile_picture_activity_title">Picha ya Wasifu</string>
   <string name="profile_progress_edit_dialog_title">Picha ya Wasifu</string>
   <string name="profile_picture_edit_alert_dialog_cancel_button">Ghairi</string>
@@ -297,51 +297,51 @@
   <string name="profile_rename_save">Hifadhi</string>
   <string name="profile_reset_pin_activity_title">Weka upya Nambari ya Siri</string>
   <string name="profile_reset_pin_main">Weka Nambari mpya ya Siri ili mtumiaji aiweke anapofikia wasifu wake.</string>
-  <string name="profile_reset_pin_user_pin_label">\nNambari ya Siri ya tarakimu 3*</string>
-  <string name="profile_reset_pin_admin_pin_label">\nNambari ya Siri ya tarakimu 5*</string>
+  <string name="profile_reset_pin_user_pin_label">Nambari ya Siri ya tarakimu 3*</string>
+  <string name="profile_reset_pin_admin_pin_label">Nambari ya Siri ya tarakimu 5*</string>
   <string name="profile_reset_pin_user_confirm_label">Thibitisha Nambari ya Siri ya tarakimu 3*</string>
   <string name="profile_reset_pin_admin_confirm_label">Thibitisha Nambari ya Siri ya tarakimu 5</string>
-  <string name="profile_reset_pin_error_user_pin_length">\nNambari yako ya Siri inapaswa kuwa na urefu wa tarakimu 3.</string>
-  <string name="profile_reset_pin_error_admin_pin_length">\nNambari yako ya Siri inapaswa kuwa na urefu wa tarakimu 5.</string>
+  <string name="profile_reset_pin_error_user_pin_length">Nambari yako ya Siri inapaswa kuwa na urefu wa tarakimu 3.</string>
+  <string name="profile_reset_pin_error_admin_pin_length">Nambari yako ya Siri inapaswa kuwa na urefu wa tarakimu 5.</string>
   <string name="add_profile_create_a_3_digit_pin">Unda Nambari ya Siri ya tarakimu 3</string>
-  <string name="add_profile_required">\nInahitajika</string>
-  <string name="back_button">\nKitufe cha Nyuma</string>
+  <string name="add_profile_required">Inahitajika</string>
+  <string name="back_button">Kitufe cha Nyuma</string>
   <string name="next">Inayofuata</string>
   <string name="administrator_controls_general_label">Jumla</string>
-  <string name="administrator_controls_edit_account">\nHariri akaunti</string>
-  <string name="administrator_controls_profile_management_label">\nUsimamizi wa Wasifu</string>
+  <string name="administrator_controls_edit_account">Hariri akaunti</string>
+  <string name="administrator_controls_profile_management_label">Usimamizi wa Wasifu</string>
   <string name="administrator_controls_edit_profiles">Hariri wasifu</string>
-  <string name="administrator_controls_download_permissions_label">\nRuhusa ya kupakua</string>
+  <string name="administrator_controls_download_permissions_label">Ruhusa ya kupakua</string>
   <string name="administrator_controls_update_on_wifi_title">Pakua na usasishe kwenye Wi-fi pekee</string>
   <string name="administrator_controls_update_on_wifi_message">Mada zitapakuliwa na kusasishwa kwenye Wi-fi pekee. Vipakuliwa au masasisho yoyote ya data ya mtandao wa simu yatawekwa kwenye foleni.</string>
   <string name="administrator_controls_auto_update_title">Sasisha mada moja kwa moja</string>
-  <string name="administrator_controls_auto_update_message">\nMada zilizopakuliwa ambazo zina maudhui mapya zinazopatikana zitasasishwa moja kwa moja.</string>
+  <string name="administrator_controls_auto_update_message">Mada zilizopakuliwa ambazo zina maudhui mapya zinazopatikana zitasasishwa moja kwa moja.</string>
   <string name="administrator_controls_app_information_label">Maelezo ya programu.</string>
   <string name="administrator_controls_app_version">Toleo la Programu</string>
-  <string name="administrator_controls_account_actions_label">\nVitendo vya akaunti</string>
+  <string name="administrator_controls_account_actions_label">Vitendo vya akaunti</string>
   <string name="administrator_controls_log_out">Toka</string>
   <string name="log_out_dialog_cancel_button">Ghairi</string>
   <string name="log_out_dialog_okay_button">Sawa</string>
   <string name="log_out_dialog_message">Je,una uhakika unataka kutoka kwenye wasifu wako?</string>
-  <string name="app_version_name">\nToleo la Programu %s</string>
+  <string name="app_version_name">Toleo la Programu %s</string>
   <string name="app_last_update_date">Sasisho la mwisho lilisakinishwa kwenye %s. Tumia nambari ya toleo iliyo hapo juu kutuma maoni kuhusu hitilafu.</string>
   <string name="app_version_activity_title">Toleo la Programu</string>
   <string name="app_language_activity_title">Lugha ya Programu</string>
   <string name="audio_language_activity_title">Lugha chaguomsingi ya Sauti</string>
   <string name="reading_text_size_activity_title">Ukubwa wa Maandishi ya Kusoma</string>
   <string name="title_reading_text_size">Ukubwa wa Maandishi ya Kusoma</string>
-  <string name="story_text_will_look_like_this">\nNakala ya hadithi itaonekana hivi.</string>
+  <string name="story_text_will_look_like_this">Nakala ya hadithi itaonekana hivi.</string>
   <string name="constant_string_for_text_size">A</string>
-  <string name="audio_language">\nSauti Chaguomsingi</string>
+  <string name="audio_language">Sauti Chaguomsingi</string>
   <string name="app_language">Lugha ya Programu</string>
   <string name="reading_text_size">Ukubwa wa Maandishi ya Kusoma</string>
   <string name="reading_text_size_small">Ndogo</string>
   <string name="reading_text_size_medium">Kati</string>
   <string name="reading_text_size_large">Kubwa</string>
-  <string name="reading_text_size_extra_large">\nKubwa Zaidi</string>
-  <string name="slide_seekbar_to_control_text_size">\nTelezesha upau wa utafutaji ili kudhibiti ukubwa wa maandishi.</string>
-  <string name="profile">\nWasifu</string>
-  <string name="story_count_text_view">\nHadithi 2</string>
+  <string name="reading_text_size_extra_large">Kubwa Zaidi</string>
+  <string name="slide_seekbar_to_control_text_size">Telezesha upau wa utafutaji ili kudhibiti ukubwa wa maandishi.</string>
+  <string name="profile">Wasifu</string>
+  <string name="story_count_text_view">Hadithi 2</string>
   <string name="topics_in_progress">Mada zinazoendelea</string>
   <string name="topic_in_progress">Mada zinazoendelea</string>
   <string name="stories_completed">Hadithi Zimekamilika</string>
@@ -349,43 +349,43 @@
   <string name="options_activity_title">Chaguzi</string>
   <string name="completed_story_list_activity_title">Hadithi Zimekamilika</string>
   <string name="walkthrough_activity_title">Mwongozo wa programu</string>
-  <string name="walkthrough_welcome_description">\nJifunze ujuzi mpya wa hesabu katika hadithi zinazokuonyesha jinsi ya kuzitumia katika maisha yako ya kila siku</string>
-  <string name="welcome">\n\"Karibu %s!\"</string>
+  <string name="walkthrough_welcome_description">Jifunze ujuzi mpya wa hesabu katika hadithi zinazokuonyesha jinsi ya kuzitumia katika maisha yako ya kila siku</string>
+  <string name="welcome">\"Karibu %s!\"</string>
   <string name="what_do_you_want_to_learn">Unataka kujifunza nini?</string>
-  <string name="great">\nMakuu</string>
+  <string name="great">Makuu</string>
   <string name="lets_get_started">Hebu \ntuanze.</string>
   <string name="yes">Ndiyo</string>
-  <string name="no">\nHapana…</string>
-  <string name="pick_a_different_topic">\nChagua \nmada tofauti.</string>
+  <string name="no">Hapana…</string>
+  <string name="pick_a_different_topic">Chagua \nmada tofauti.</string>
   <string name="are_you_interested">Je, unavutiwa na:\n%s?</string>
   <string name="new_hint_available">Kidokezo kipya kinapatikana</string>
-  <string name="show_hints_and_solution">\nOnyesha vidokezo na suluhisho</string>
+  <string name="show_hints_and_solution">Onyesha vidokezo na suluhisho</string>
   <string name="hints_andSolution_close_icon_description">Nenda juu</string>
   <string name="hints_toolbar_title">Vidokezo</string>
   <string name="reveal_solution">Fichua Suluhisho</string>
-  <string name="reveal_hint">\nFichua Kidokezo</string>
+  <string name="reveal_hint">Fichua Kidokezo</string>
   <string name="show_hide_hint_list">Onyesha/Ficha orodha ya vidokezo ya %s</string>
-  <string name="show_hide_solution_list">\nOnyesha/Ficha suluhisho</string>
+  <string name="show_hide_solution_list">Onyesha/Ficha suluhisho</string>
   <string name="the_only_solution_is">Suluhisho pekee ni:</string>
   <string name="this_will_reveal_the_solution">Hii itafichua suluhisho. Una uhakika?</string>
   <string name="reveal">Fichua</string>
   <string name="just_now">sasa hivi</string>
-  <string name="last_logged_in_recently">\nhivi karibuni</string>
+  <string name="last_logged_in_recently">hivi karibuni</string>
   <string name="time_ago">%s iliyopita</string>
-  <string name="yesterday">\njana</string>
+  <string name="yesterday">jana</string>
   <string name="return_to_topic">Rudi kwenye mada</string>
   <string name="explanation">Ufafanuzi:</string>
-  <string name="drag_and_drop_interaction_group_merge_hint">\nIkiwa vitu viwili ni sawa, viunganishe.</string>
+  <string name="drag_and_drop_interaction_group_merge_hint">Ikiwa vitu viwili ni sawa, viunganishe.</string>
   <string name="link_to_item_below">Unganisha na kipengee %s</string>
   <string name="unlink_items">Tenganisha vipengee katika %s</string>
   <string name="move_item_down_content_description">Hamisha kipengee chini hadi %s</string>
-  <string name="move_item_up_content_description">\nHamisha kipengee juu hadi %s</string>
+  <string name="move_item_up_content_description">Hamisha kipengee juu hadi %s</string>
   <string name="up_button_disabled">Juu</string>
-  <string name="down_button_disabled">\nChini</string>
+  <string name="down_button_disabled">Chini</string>
   <string name="profile_last_visited">%s %s</string>
   <plurals name="minutes">
     <item quantity="one">dakika</item>
-    <item quantity="other"> dakika %s</item>
+    <item quantity="other">dakika %s</item>
   </plurals>
   <plurals name="hours">
     <item quantity="one">saa</item>
@@ -396,16 +396,16 @@
     <item quantity="other">siku %s</item>
   </plurals>
   <string name="topic_revision_recyclerview_tag">mada_marudio_mtazamo wa kuchakata tena_tag</string>
-  <string name="ongoing_recycler_view_tag">\nInaendelea_kuchakata tena_mtazamo_tag</string>
-  <string name="item_selection_text">\nTafadhali chagua angalau chaguo moja.</string>
-  <string name="unsupported_app_version_dialog_title">\nToleo la programu lisilotumika</string>
+  <string name="ongoing_recycler_view_tag">Inaendelea_kuchakata tena_mtazamo_tag</string>
+  <string name="item_selection_text">Tafadhali chagua angalau chaguo moja.</string>
+  <string name="unsupported_app_version_dialog_title">Toleo la programu lisilotumika</string>
   <string name="unsupported_app_version_dialog_message">Toleo hili la programu halitumiki tena. Tafadhali isasishe kupitia hifadhi ya michezo.</string>
   <string name="unsupported_app_version_dialog_close_button_text">Funga programu</string>
-  <string name="ratio_content_description_separator">\nkwa</string>
-  <string name="ratio_default_hint_text">\nWeka uwiano katika fomu x:y.</string>
+  <string name="ratio_content_description_separator">kwa</string>
+  <string name="ratio_default_hint_text">Weka uwiano katika fomu x:y.</string>
   <string name="smallest_text_size_content_description">Maandishi madogo zaidi</string>
   <string name="largest_text_size_content_description">Maandishi kubwa zaidi</string>
-  <string name="coming_soon">\nInakuja Hivi Karibuni</string>
+  <string name="coming_soon">Inakuja Hivi Karibuni</string>
   <string name="recommended_stories">Hadithi Zinazopendekezwa</string>
   <string name="stories_for_you">Hadithi Kwa Ajili Yako</string>
   <string name="question_player_activity_title">Hali ya Mazoezi</string>
@@ -417,28 +417,28 @@
   <string name="correct_submitted_answer">Jibu sahihi lililowasilishwa</string>
   <string name="correct_submitted_answer_with_append">Jibu sahihi lililowasilishwa: %s</string>
   <string name="incorrect_submitted_answer">Jibu lililowasilishwa lisilo sahihi</string>
-  <string name="incorrect_submitted_answer_with_append">\nJibu lililowasilishwa lisilo sahihi: %s</string>
+  <string name="incorrect_submitted_answer_with_append">Jibu lililowasilishwa lisilo sahihi: %s</string>
   <string name="third_party_dependency_list_activity_title">Tegemeo ya mhusika wa tatu</string>
   <string name="third_party_dependency_version_formatter">toleo %s</string>
   <string name="license_list_activity_title">Leseni za Hakimiliki</string>
-  <string name="license_text_viewer_activity_title">\nMtazamo wa Leseni ya Hakimiliki</string>
-  <string name="help_activity_back_arrow_description">\nNenda nyuma hadi %s</string>
-  <string name="help_activity_third_party_dependencies_list">\norodha ya tegemezi ya mhusika wa tatu</string>
+  <string name="license_text_viewer_activity_title">Mtazamo wa Leseni ya Hakimiliki</string>
+  <string name="help_activity_back_arrow_description">Nenda nyuma hadi %s</string>
+  <string name="help_activity_third_party_dependencies_list">orodha ya tegemezi ya mhusika wa tatu</string>
   <string name="help_activity_copyright_licenses_list">orodha ya leseni za hakimiliki</string>
-  <string name="resume_lesson_activity_title">\nRejesha Somo</string>
+  <string name="resume_lesson_activity_title">Rejesha Somo</string>
   <string name="resume_lesson_button">Endelea</string>
-  <string name="start_over_lesson_button">\nAnza tena</string>
-  <string name="home_screen_good_morning_greeting_fragment">\nHabari ya asubuhi,</string>
-  <string name="home_screen_good_afternoon_greeting_fragment">\nHabari ya mchana,</string>
+  <string name="start_over_lesson_button">Anza tena</string>
+  <string name="home_screen_good_morning_greeting_fragment">Habari ya asubuhi,</string>
+  <string name="home_screen_good_afternoon_greeting_fragment">Habari ya mchana,</string>
   <string name="home_screen_good_evening_greeting_fragment">Habari ya jioni,</string>
-  <string name="faq_question_1">\nNinawezaje kuunda wasifu mpya?</string>
-  <string name="faq_question_2">\nNinawezaje kufuta wasifu?</string>
+  <string name="faq_question_1">Ninawezaje kuunda wasifu mpya?</string>
+  <string name="faq_question_2">Ninawezaje kufuta wasifu?</string>
   <string name="faq_question_3">Nitabadilisha aje barua pepe/nambari yangu ya simu?</string>
-  <string name="faq_question_4">\n%s ni nini?</string>
+  <string name="faq_question_4">%s ni nini?</string>
   <string name="faq_question_5">Msimamizi ni nani?</string>
-  <string name="faq_question_6">\nKwa nini kicheza Uchunguzi hakipakii?</string>
+  <string name="faq_question_6">Kwa nini kicheza Uchunguzi hakipakii?</string>
   <string name="faq_question_7">Kwa nini sauti yangu haichezwi?</string>
-  <string name="faq_question_8">\nNitapakua aje Mada?</string>
+  <string name="faq_question_8">Nitapakua aje Mada?</string>
   <string name="faq_question_9">Sijapata swali langu hapa. Nini sasa?</string>
   <string name="faq_answer_1">&lt;p&gt;Ikiwa ni mara yako ya kwanza kuunda wasifu na huna Nambari ya Siri: &lt;/p&gt; &lt;p&gt; 1. Kutoka kwa Kichagua Wasifu, gusa &lt;strong&gt;Weka Wasifu Nyingi&lt;/strong&gt;. &lt;/p&gt; &lt;p&gt; 2. Unda Nambari ya Siri na &lt;strong&gt;Hifadhi&lt;/strong&gt;. &lt;/p&gt; &lt;p&gt; 3. Jaza sehemu zote za wasifu. &lt;/p&gt; &lt;ol&gt; &lt;li&gt; (Si lazima) Pakia picha. &lt;/li&gt; &lt;li&gt; Weka jina. &lt;/li&gt; &lt;li&gt; (Si lazima) Weka Nambari ya Siri yenye tarakimu 3. &lt;/li&gt; &lt;/ol&gt; &lt;p&gt; 4. Gusa &lt;strong&gt;Unda&lt;/strong&gt;. Wasifu huu umeongezwa kwa Kichagua Wasifu wako! &lt;br/&gt; &lt;br/&gt; Ikiwa umeunda wasifu hapo awali na una Nambari ya Siri: &lt;/p&gt; &lt;p&gt; 1. Kutoka kwa Kichagua Wasifu, gusa &lt;strong&gt;Ongeza Wasifu&lt;/strong&gt;. &lt;/p&gt; &lt;p&gt; 2. Weka Nambari yako ya Siri na uguse &lt;strong&gt;Wasilisha&lt;/strong&gt;. &lt;/p&gt; &lt;p&gt; 3. Jaza sehemu zote za wasifu. &lt;/p&gt; &lt;ol&gt; &lt;li&gt; (Si lazima) Pakia picha. &lt;/li&gt; &lt;li&gt; Weka jina. &lt;/li&gt; &lt;li&gt; (Si lazima) Weka Nambari ya Siri yenye tarakimu 3. &lt;/li&gt; &lt;/ol&gt; &lt;p&gt; 4. Gusa &lt;strong&gt;Unda&lt;/strong&gt;. Wasifu huu umeongezwa kwa Kichagua Wasifu wako! &lt;br/&gt; &lt;br/&gt; Kumbuka: &lt;u&gt;Msimamizi pekee&lt;/u&gt; ndiye anayeweza kudhibiti wasifu.&lt;/p&gt;</string>
   <string name="faq_answer_2">&lt;p&gt;Wasifu unapofutwa:&lt;/p&gt; &lt;p&gt;&lt;br&gt;&lt;/p&gt; &lt;p&gt; &lt;li&gt; Wasifu hauwezi kurejeshwa. &lt;/li&gt; &lt;/p&gt; &lt;p&gt; &lt;li&gt; Taarifa ya wasifu kama vile jina, picha na maendeleo yatafutwa kabisa. &lt;/li&gt; &lt;/p&gt; &lt;p&gt;&lt;br&gt;&lt;/p&gt; &lt;p&gt;Ili kufuta wasifu (bila kujumuisha &lt;u&gt;Msimamizi&lt;/u&gt;):&lt;/p&gt; &lt;p&gt;1. Kutoka kwa Ukurasa wa Mwanzo wa Msimamizi, gusa kitufe cha menyu kilicho upande wa juu kushoto.&lt;/p&gt; &lt;p&gt;2. Gusa &lt;strong&gt;Vidhibiti vya Msimamizi&lt;/strong&gt;.&lt;/p&gt; &lt;p&gt;3. Gusa &lt;strong&gt;Hariri Wasifu&lt;/strong&gt;.&lt;/p&gt; &lt;p&gt;4. Gonga Wasifu ambao ungependa kufuta.&lt;/p&gt; &lt;p&gt;5. Katika sehemu ya chini ya skrini, gusa &lt;strong&gt;Ufutaji wa Wasifu&lt;/strong&gt;.&lt;/p&gt; &lt;p&gt;6. Gusa &lt;strong&gt;Futa&lt;/strong&gt; ili kuthibitisha kufuta.&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Kumbuka: &lt;u&gt;Msimamizi&lt;/u&gt; pekee ndiye anayeweza kudhibiti wasifu.&lt;/ p&gt;</string>
diff --git a/app/src/main/res/values/untranslated_strings.xml b/app/src/main/res/values/untranslated_strings.xml
index a0482e4ba72..788c6d3de50 100644
--- a/app/src/main/res/values/untranslated_strings.xml
+++ b/app/src/main/res/values/untranslated_strings.xml
@@ -79,4 +79,7 @@
   <string name="learner_analytics_sync_status_network_error" translatable="false">Please connect to a WiFi or Cellular network in order to upload profile data.</string>
   <string name="learner_analytics_device_id_clipboard_label_description" translatable="false">%s installation ID</string>
   <string name="learner_analytics_learner_id_clipboard_label_description" translatable="false">%s\'s learner ID</string>
+  <!-- Temporary learner strings. -->
+  <string name="temporary_translate_to_swahili" translatable="false">Switch lesson to Swahili</string>
+  <string name="temporary_translate_to_english" translatable="false">Switch lesson to English</string>
 </resources>

From f2cbc0d0e720ba355538af172cfec3fe0dceff8c Mon Sep 17 00:00:00 2001
From: Ben Henning <ben@oppia.org>
Date: Wed, 24 Aug 2022 13:38:51 -0500
Subject: [PATCH 02/38] Expand concept card support.

This adds support for opening concept cards from hints, solutions, and
other concept cards.
---
 .../HintsAndSolutionDialogFragment.kt         |  12 +-
 ...HintsAndSolutionDialogFragmentPresenter.kt |  45 ++++--
 .../player/exploration/ExplorationActivity.kt |   9 +-
 .../testing/StateFragmentTestActivity.kt      |   8 +-
 .../ConceptCardFragmentPresenter.kt           |  44 ++++--
 .../questionplayer/QuestionPlayerActivity.kt  |  31 +---
 .../QuestionPlayerActivityPresenter.kt        |  41 ++++++
 app/src/main/res/layout/hints_summary.xml     |   3 +-
 app/src/main/res/layout/solution_summary.xml  |   3 +-
 .../conceptcard/ConceptCardFragmentTest.kt    | 136 +++++++++++-------
 .../player/state/StateFragmentLocalTest.kt    | 103 +++++++++++++
 domain/src/main/assets/skills.json            |   2 +-
 domain/src/main/assets/skills.textproto       |   2 +-
 domain/src/main/assets/test_exp_id_2.json     |   4 +-
 .../src/main/assets/test_exp_id_2.textproto   |   4 +-
 .../android/util/caching/CachingModule.kt     |   2 +-
 16 files changed, 328 insertions(+), 121 deletions(-)

diff --git a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragment.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragment.kt
index 0552263f5a4..fb803de04cc 100644
--- a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragment.kt
+++ b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragment.kt
@@ -15,6 +15,7 @@ import org.oppia.android.util.extensions.getProto
 import org.oppia.android.util.extensions.getStringFromBundle
 import org.oppia.android.util.extensions.putProto
 import javax.inject.Inject
+import org.oppia.android.app.model.ProfileId
 
 private const val CURRENT_EXPANDED_ITEMS_LIST_SAVED_KEY =
   "HintsAndSolutionDialogFragment.current_expanded_list_index"
@@ -47,6 +48,8 @@ class HintsAndSolutionDialogFragment :
     internal const val HELP_INDEX_KEY = "HintsAndSolutionDialogFragment.help_index"
     internal const val WRITTEN_TRANSLATION_CONTEXT_KEY =
       "HintsAndSolutionDialogFragment.written_translation_context"
+    internal const val PROFILE_ID_KEY =
+      "HintsAndSolutionDialogFragment.profile_id"
 
     /**
      * Creates a new instance of a DialogFragment to display hints and solution
@@ -57,13 +60,15 @@ class HintsAndSolutionDialogFragment :
      * @param helpIndex the [HelpIndex] corresponding to the current hints/solution configuration
      * @param writtenTranslationContext the [WrittenTranslationContext] needed to translate the
      *     hints/solution
+     * @param profileId the ID of the profile viewing the hint/solution
      * @return [HintsAndSolutionDialogFragment]: DialogFragment
      */
     fun newInstance(
       id: String,
       state: State,
       helpIndex: HelpIndex,
-      writtenTranslationContext: WrittenTranslationContext
+      writtenTranslationContext: WrittenTranslationContext,
+      profileId: ProfileId
     ): HintsAndSolutionDialogFragment {
       return HintsAndSolutionDialogFragment().apply {
         arguments = Bundle().apply {
@@ -71,6 +76,7 @@ class HintsAndSolutionDialogFragment :
           putProto(STATE_KEY, state)
           putProto(HELP_INDEX_KEY, helpIndex)
           putProto(WRITTEN_TRANSLATION_CONTEXT_KEY, writtenTranslationContext)
+          putProto(PROFILE_ID_KEY, profileId)
         }
       }
     }
@@ -114,6 +120,7 @@ class HintsAndSolutionDialogFragment :
     val helpIndex = args.getProto(HELP_INDEX_KEY, HelpIndex.getDefaultInstance())
     val writtenTranslationContext =
       args.getProto(WRITTEN_TRANSLATION_CONTEXT_KEY, WrittenTranslationContext.getDefaultInstance())
+    val profileId = args.getProto(PROFILE_ID_KEY, ProfileId.getDefaultInstance())
 
     return hintsAndSolutionDialogFragmentPresenter.handleCreateView(
       inflater,
@@ -127,7 +134,8 @@ class HintsAndSolutionDialogFragment :
       index,
       isHintRevealed,
       solutionIndex,
-      isSolutionRevealed
+      isSolutionRevealed,
+      profileId
     )
   }
 
diff --git a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragmentPresenter.kt
index c7c56b44972..33ed5eb9878 100644
--- a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragmentPresenter.kt
@@ -25,6 +25,8 @@ import org.oppia.android.util.parser.html.ExplorationHtmlParserEntityType
 import org.oppia.android.util.parser.html.HtmlParser
 import java.lang.IllegalStateException
 import javax.inject.Inject
+import org.oppia.android.app.model.ProfileId
+import org.oppia.android.app.topic.conceptcard.ConceptCardFragment
 
 const val TAG_REVEAL_SOLUTION_DIALOG = "REVEAL_SOLUTION_DIALOG"
 
@@ -37,7 +39,7 @@ class HintsAndSolutionDialogFragmentPresenter @Inject constructor(
   @DefaultResourceBucketName private val resourceBucketName: String,
   @ExplorationHtmlParserEntityType private val entityType: String,
   private val resourceHandler: AppLanguageResourceHandler
-) {
+) : HtmlParser.CustomOppiaTagActionListener {
 
   private var index: Int? = null
   private var expandedItemsList = ArrayList<Int>()
@@ -49,6 +51,7 @@ class HintsAndSolutionDialogFragmentPresenter @Inject constructor(
   private lateinit var state: State
   private lateinit var helpIndex: HelpIndex
   private lateinit var writtenTranslationContext: WrittenTranslationContext
+  private lateinit var profileId: ProfileId
   private lateinit var itemList: List<HintsAndSolutionItemViewModel>
   private lateinit var bindingAdapter: BindableAdapter<HintsAndSolutionItemViewModel>
 
@@ -72,7 +75,8 @@ class HintsAndSolutionDialogFragmentPresenter @Inject constructor(
     index: Int?,
     isHintRevealed: Boolean?,
     solutionIndex: Int?,
-    isSolutionRevealed: Boolean?
+    isSolutionRevealed: Boolean?,
+    profileId: ProfileId
   ): View {
     binding =
       HintsAndSolutionFragmentBinding.inflate(inflater, container, /* attachToRoot= */ false)
@@ -97,6 +101,7 @@ class HintsAndSolutionDialogFragmentPresenter @Inject constructor(
     this.state = state
     this.helpIndex = helpIndex
     this.writtenTranslationContext = writtenTranslationContext
+    this.profileId = profileId
 
     val newAvailableHintIndex = computeNewAvailableHintIndex(helpIndex)
     viewModel.newAvailableHintIndex.set(newAvailableHintIndex)
@@ -218,9 +223,13 @@ class HintsAndSolutionDialogFragmentPresenter @Inject constructor(
         resourceBucketName,
         entityType,
         hintsViewModel.explorationId.get()!!,
-        /* imageCenterAlign= */ true
+        customOppiaTagActionListener = this,
+        imageCenterAlign = true
       ).parseOppiaHtml(
-        hintsViewModel.hintsAndSolutionSummary.get()!!, binding.hintsAndSolutionSummary
+        hintsViewModel.hintsAndSolutionSummary.get()!!,
+        binding.hintsAndSolutionSummary,
+        supportsLinks = true,
+        supportsConceptCards = true
       )
 
     if (hintsViewModel.hintCanBeRevealed.get()!!) {
@@ -233,7 +242,7 @@ class HintsAndSolutionDialogFragmentPresenter @Inject constructor(
       }
     }
 
-    binding.root.setOnClickListener {
+    binding.expandableHintHeader.setOnClickListener {
       if (hintsViewModel.isHintRevealed.get()!!) {
         expandOrCollapseItem(position)
       }
@@ -280,11 +289,19 @@ class HintsAndSolutionDialogFragmentPresenter @Inject constructor(
     } else {
       binding.solutionCorrectAnswer.text = solutionViewModel.correctAnswer.get()
     }
-    binding.solutionSummary.text = htmlParserFactory.create(
-      resourceBucketName, entityType, viewModel.explorationId.get()!!, /* imageCenterAlign= */ true
-    ).parseOppiaHtml(
-      solutionViewModel.solutionSummary.get()!!, binding.solutionSummary
-    )
+    binding.solutionSummary.text =
+      htmlParserFactory.create(
+        resourceBucketName,
+        entityType,
+        viewModel.explorationId.get()!!,
+        customOppiaTagActionListener = this,
+        imageCenterAlign = true
+      ).parseOppiaHtml(
+        solutionViewModel.solutionSummary.get()!!,
+        binding.solutionSummary,
+        supportsLinks = true,
+        supportsConceptCards = true
+      )
 
     if (solutionViewModel.solutionCanBeRevealed.get()!!) {
       binding.root.visibility = View.VISIBLE
@@ -293,7 +310,7 @@ class HintsAndSolutionDialogFragmentPresenter @Inject constructor(
       }
     }
 
-    binding.root.setOnClickListener {
+    binding.expandableSolutionHeader.setOnClickListener {
       if (solutionViewModel.isSolutionRevealed.get()!!) {
         expandOrCollapseItem(position)
       }
@@ -365,4 +382,10 @@ class HintsAndSolutionDialogFragmentPresenter @Inject constructor(
     this.solutionIndex = solutionIndex
     this.isSolutionRevealed = isSolutionRevealed
   }
+
+  override fun onConceptCardLinkClicked(view: View, skillId: String) {
+    ConceptCardFragment
+      .newInstance(skillId, profileId)
+      .showNow(fragment.childFragmentManager, ConceptCardFragment.CONCEPT_CARD_DIALOG_FRAGMENT_TAG)
+  }
 }
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 29c46c4c7bf..3fb3feffbe2 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
@@ -22,6 +22,7 @@ import org.oppia.android.app.player.state.listener.StateKeyboardButtonListener
 import org.oppia.android.app.player.stopplaying.StopStatePlayingSessionWithSavedProgressListener
 import org.oppia.android.app.topic.conceptcard.ConceptCardListener
 import javax.inject.Inject
+import org.oppia.android.app.model.ProfileId
 
 const val TAG_HINTS_AND_SOLUTION_DIALOG = "HINTS_AND_SOLUTION_DIALOG"
 
@@ -41,7 +42,7 @@ class ExplorationActivity :
 
   @Inject
   lateinit var explorationActivityPresenter: ExplorationActivityPresenter
-  private var internalProfileId: Int = -1
+  private lateinit var profileId: ProfileId
   private lateinit var topicId: String
   private lateinit var storyId: String
   private lateinit var explorationId: String
@@ -53,7 +54,8 @@ class ExplorationActivity :
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     (activityComponent as ActivityComponentImpl).inject(this)
-    internalProfileId = intent.getIntExtra(EXPLORATION_ACTIVITY_PROFILE_ID_ARGUMENT_KEY, -1)
+    val internalProfileId = intent.getIntExtra(EXPLORATION_ACTIVITY_PROFILE_ID_ARGUMENT_KEY, -1)
+    profileId = ProfileId.newBuilder().apply { internalId = internalProfileId }.build()
     topicId = checkNotNull(intent.getStringExtra(EXPLORATION_ACTIVITY_TOPIC_ID_ARGUMENT_KEY)) {
       "Expected $EXPLORATION_ACTIVITY_TOPIC_ID_ARGUMENT_KEY to be in intent extras."
     }
@@ -178,7 +180,8 @@ class ExplorationActivity :
         explorationId,
         state,
         helpIndex,
-        writtenTranslationContext
+        writtenTranslationContext,
+        profileId
       )
       hintsAndSolutionDialogFragment.showNow(supportFragmentManager, TAG_HINTS_AND_SOLUTION_DIALOG)
     }
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 29cb26a42e4..6a2117728c6 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
@@ -19,6 +19,7 @@ import org.oppia.android.app.player.state.listener.RouteToHintsAndSolutionListen
 import org.oppia.android.app.player.state.listener.StateKeyboardButtonListener
 import org.oppia.android.app.player.stopplaying.StopStatePlayingSessionWithSavedProgressListener
 import javax.inject.Inject
+import org.oppia.android.app.model.ProfileId
 
 internal const val TEST_ACTIVITY_PROFILE_ID_EXTRA_KEY =
   "StateFragmentTestActivity.test_activity_profile_id"
@@ -46,10 +47,14 @@ class StateFragmentTestActivity :
   lateinit var stateFragmentTestActivityPresenter: StateFragmentTestActivityPresenter
   private lateinit var state: State
   private lateinit var writtenTranslationContext: WrittenTranslationContext
+  private lateinit var profileId: ProfileId
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     (activityComponent as ActivityComponentImpl).inject(this)
+    profileId = ProfileId.newBuilder().apply {
+      internalId = intent.getIntExtra(TEST_ACTIVITY_PROFILE_ID_EXTRA_KEY, -1)
+    }.build()
     stateFragmentTestActivityPresenter.handleOnCreate()
   }
 
@@ -109,7 +114,8 @@ class StateFragmentTestActivity :
           explorationId,
           state,
           helpIndex,
-          writtenTranslationContext
+          writtenTranslationContext,
+          profileId
         )
       hintsAndSolutionFragment.showNow(supportFragmentManager, TAG_HINTS_AND_SOLUTION_DIALOG)
     }
diff --git a/app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentPresenter.kt
index 28c8d1b8415..5e970d065b0 100644
--- a/app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentPresenter.kt
@@ -26,7 +26,9 @@ class ConceptCardFragmentPresenter @Inject constructor(
   @DefaultResourceBucketName private val resourceBucketName: String,
   private val viewModelProvider: ViewModelProvider<ConceptCardViewModel>,
   private val translationController: TranslationController
-) {
+) : HtmlParser.CustomOppiaTagActionListener {
+  private lateinit var profileId: ProfileId
+
   /**
    * Sets up data binding and toolbar.
    * Host activity must inherit ConceptCardListener to dismiss this fragment.
@@ -37,6 +39,7 @@ class ConceptCardFragmentPresenter @Inject constructor(
     skillId: String,
     profileId: ProfileId
   ): View? {
+    this.profileId = profileId
     val binding = ConceptCardFragmentBinding.inflate(
       inflater,
       container,
@@ -62,18 +65,27 @@ class ConceptCardFragmentPresenter @Inject constructor(
     }
 
     viewModel.conceptCardLiveData.observe(
-      fragment,
-      { ephemeralConceptCard ->
-        val explanationHtml =
-          translationController.extractString(
-            ephemeralConceptCard.conceptCard.explanation,
-            ephemeralConceptCard.writtenTranslationContext
-          )
-        view.text = htmlParserFactory
-          .create(resourceBucketName, entityType, skillId, imageCenterAlign = true)
-          .parseOppiaHtml(explanationHtml, view)
-      }
-    )
+      fragment
+    ) { ephemeralConceptCard ->
+      val explanationHtml =
+        translationController.extractString(
+          ephemeralConceptCard.conceptCard.explanation,
+          ephemeralConceptCard.writtenTranslationContext
+        )
+      view.text =
+        htmlParserFactory.create(
+          resourceBucketName,
+          entityType,
+          skillId,
+          customOppiaTagActionListener = this,
+          imageCenterAlign = true
+        ).parseOppiaHtml(
+          explanationHtml,
+          view,
+          supportsLinks = true,
+          supportsConceptCards = true
+        )
+    }
 
     return binding.root
   }
@@ -85,4 +97,10 @@ class ConceptCardFragmentPresenter @Inject constructor(
   private fun logConceptCardEvent(skillId: String) {
     oppiaLogger.logImportantEvent(oppiaLogger.createOpenConceptCardContext(skillId))
   }
+
+  override fun onConceptCardLinkClicked(view: View, skillId: String) {
+    ConceptCardFragment
+      .newInstance(skillId, profileId)
+      .showNow(fragment.childFragmentManager, ConceptCardFragment.CONCEPT_CARD_DIALOG_FRAGMENT_TAG)
+  }
 }
diff --git a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivity.kt b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivity.kt
index d4153be4460..4ac9df43fe8 100644
--- a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivity.kt
@@ -46,9 +46,6 @@ class QuestionPlayerActivity :
   @Inject
   lateinit var questionPlayerActivityPresenter: QuestionPlayerActivityPresenter
 
-  private lateinit var state: State
-  private lateinit var writtenTranslationContext: WrittenTranslationContext
-
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     (activityComponent as ActivityComponentImpl).inject(this)
@@ -105,39 +102,19 @@ class QuestionPlayerActivity :
     questionPlayerActivityPresenter.revealSolution()
   }
 
-  private fun getHintsAndSolution(): HintsAndSolutionDialogFragment? {
-    return supportFragmentManager.findFragmentByTag(
-      TAG_HINTS_AND_SOLUTION_DIALOG
-    ) as HintsAndSolutionDialogFragment?
-  }
-
   override fun routeToHintsAndSolution(
-    questionId: String,
+    id: String,
     helpIndex: HelpIndex
   ) {
-    if (getHintsAndSolution() == null) {
-      val hintsAndSolutionDialogFragment =
-        HintsAndSolutionDialogFragment.newInstance(
-          questionId,
-          state,
-          helpIndex,
-          writtenTranslationContext
-        )
-      hintsAndSolutionDialogFragment.showNow(supportFragmentManager, TAG_HINTS_AND_SOLUTION_DIALOG)
-    }
+    questionPlayerActivityPresenter.routeToHintsAndSolution(id, helpIndex)
   }
 
-  override fun dismiss() {
-    getHintsAndSolution()?.dismiss()
-  }
+  override fun dismiss() = questionPlayerActivityPresenter.dismissHintsAndSolutionDialog()
 
   override fun onQuestionStateLoaded(
     state: State,
     writtenTranslationContext: WrittenTranslationContext
-  ) {
-    this.state = state
-    this.writtenTranslationContext = writtenTranslationContext
-  }
+  ) = questionPlayerActivityPresenter.loadQuestionState(state, writtenTranslationContext)
 
   override fun dismissConceptCard() {
     questionPlayerActivityPresenter.dismissConceptCard()
diff --git a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityPresenter.kt
index 6e58b27a68e..2d37b395747 100644
--- a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityPresenter.kt
@@ -12,6 +12,11 @@ import org.oppia.android.domain.question.QuestionTrainingController
 import org.oppia.android.util.data.AsyncResult
 import org.oppia.android.util.data.DataProviders.Companion.toLiveData
 import javax.inject.Inject
+import org.oppia.android.app.hintsandsolution.HintsAndSolutionDialogFragment
+import org.oppia.android.app.model.HelpIndex
+import org.oppia.android.app.model.State
+import org.oppia.android.app.model.WrittenTranslationContext
+import org.oppia.android.app.player.exploration.TAG_HINTS_AND_SOLUTION_DIALOG
 
 const val TAG_QUESTION_PLAYER_FRAGMENT = "TAG_QUESTION_PLAYER_FRAGMENT"
 private const val TAG_HINTS_AND_SOLUTION_QUESTION_MANAGER = "HINTS_AND_SOLUTION_QUESTION_MANAGER"
@@ -24,6 +29,8 @@ class QuestionPlayerActivityPresenter @Inject constructor(
   private val oppiaLogger: OppiaLogger
 ) {
   private lateinit var profileId: ProfileId
+  private lateinit var state: State
+  private lateinit var writtenTranslationContext: WrittenTranslationContext
 
   fun handleOnCreate(profileId: ProfileId) {
     this.profileId = profileId
@@ -155,6 +162,30 @@ class QuestionPlayerActivityPresenter @Inject constructor(
     ) as QuestionPlayerFragment?
   }
 
+  fun loadQuestionState(state: State, writtenTranslationContext: WrittenTranslationContext) {
+    this.state = state
+    this.writtenTranslationContext = writtenTranslationContext
+  }
+
+  fun routeToHintsAndSolution(
+    questionId: String,
+    helpIndex: HelpIndex
+  ) {
+    if (getHintsAndSolutionDialogFragment() == null) {
+      val hintsAndSolutionDialogFragment =
+        HintsAndSolutionDialogFragment.newInstance(
+          questionId,
+          state,
+          helpIndex,
+          writtenTranslationContext,
+          profileId
+        )
+      hintsAndSolutionDialogFragment.showNow(
+        activity.supportFragmentManager, TAG_HINTS_AND_SOLUTION_DIALOG
+      )
+    }
+  }
+
   fun revealHint(hintIndex: Int) {
     val questionPlayerFragment =
       activity.supportFragmentManager.findFragmentByTag(
@@ -171,5 +202,15 @@ class QuestionPlayerActivityPresenter @Inject constructor(
     questionPlayerFragment.revealSolution()
   }
 
+  fun dismissHintsAndSolutionDialog() {
+    getHintsAndSolutionDialogFragment()?.dismiss()
+  }
+
   fun dismissConceptCard() = getQuestionPlayerFragment()?.dismissConceptCard()
+
+  private fun getHintsAndSolutionDialogFragment(): HintsAndSolutionDialogFragment? {
+    return activity.supportFragmentManager.findFragmentByTag(
+      TAG_HINTS_AND_SOLUTION_DIALOG
+    ) as? HintsAndSolutionDialogFragment
+  }
 }
diff --git a/app/src/main/res/layout/hints_summary.xml b/app/src/main/res/layout/hints_summary.xml
index c91b9d98052..c378745d90a 100644
--- a/app/src/main/res/layout/hints_summary.xml
+++ b/app/src/main/res/layout/hints_summary.xml
@@ -45,7 +45,8 @@
 
         <androidx.constraintlayout.widget.ConstraintLayout
           android:layout_width="match_parent"
-          android:layout_height="wrap_content">
+          android:layout_height="wrap_content"
+          android:id="@+id/expandable_hint_header">
 
           <TextView
             android:id="@+id/hint_title"
diff --git a/app/src/main/res/layout/solution_summary.xml b/app/src/main/res/layout/solution_summary.xml
index 1e384675db3..e5e373cdbfe 100644
--- a/app/src/main/res/layout/solution_summary.xml
+++ b/app/src/main/res/layout/solution_summary.xml
@@ -45,7 +45,8 @@
 
         <androidx.constraintlayout.widget.ConstraintLayout
           android:layout_width="match_parent"
-          android:layout_height="wrap_content">
+          android:layout_height="wrap_content"
+          android:id="@+id/expandable_solution_header">
 
           <TextView
             android:id="@+id/solution_title"
diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentTest.kt
index c0898715487..59437fa016c 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentTest.kt
@@ -3,8 +3,10 @@ package org.oppia.android.app.topic.conceptcard
 import android.app.Application
 import android.content.Context
 import android.widget.TextView
+import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import androidx.test.core.app.ActivityScenario
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
@@ -112,6 +114,13 @@ import org.robolectric.annotation.Config
 import org.robolectric.annotation.LooperMode
 import javax.inject.Inject
 import javax.inject.Singleton
+import android.text.style.ClickableSpan
+import androidx.test.espresso.UiController
+import androidx.test.espresso.ViewAction
+import org.hamcrest.Description
+import org.hamcrest.Matcher
+import org.hamcrest.TypeSafeMatcher
+import android.text.Spannable
 
 /** Tests for [ConceptCardFragment]. */
 @RunWith(AndroidJUnit4::class)
@@ -216,43 +225,22 @@ class ConceptCardFragmentTest {
 
       onView(withId(R.id.concept_card_explanation_text))
         .inRoot(isDialog())
-        .check(
-          matches(
-            withText(
-              "Hello. Welcome to Oppia."
-            )
-          )
-        )
-      onView(withId(R.id.concept_card_explanation_text))
-        .inRoot(isDialog())
-        .check(matches(not(containsRichText())))
+        .check(matches(withText(containsString("Hello. Welcome to Oppia."))))
     }
   }
 
   @Test
-  fun testConceptCardFragment_openDialogFragment0_checkSkillAndExplanationAreDisplayedWithoutRichText() { // ktlint-disable max-line-length
+  fun testConceptCardFragment_openDialogFragment0_checkExplanationDisplayedWithoutRichText() {
     launchTestActivity().use {
       onView(withId(R.id.open_dialog_0)).perform(click())
       testCoroutineDispatchers.runCurrent()
 
       onView(withId(R.id.concept_card_heading_text))
         .inRoot(isDialog())
-        .check(
-          matches(
-            withText(
-              "An important skill"
-            )
-          )
-        )
+        .check(matches(withText("An important skill")))
       onView(withId(R.id.concept_card_explanation_text))
         .inRoot(isDialog())
-        .check(
-          matches(
-            withText(
-              "Hello. Welcome to Oppia."
-            )
-          )
-        )
+        .check(matches(withText(containsString("Hello. Welcome to Oppia."))))
       onView(withId(R.id.concept_card_explanation_text))
         .inRoot(isDialog())
         .check(matches(not(containsRichText())))
@@ -260,29 +248,20 @@ class ConceptCardFragmentTest {
   }
 
   @Test
-  fun testConceptCardFragment_openDialogFragment1_checkSkillAndExplanationAreDisplayedWithRichText() { // ktlint-disable max-line-length
+  fun testConceptCardFragment_openDialogFragment1_checkExplanationDisplayedWithRichText() {
     launchTestActivity().use {
       onView(withId(R.id.open_dialog_1)).perform(click())
       testCoroutineDispatchers.runCurrent()
 
       onView(withId(R.id.concept_card_heading_text))
         .inRoot(isDialog())
-        .check(
-          matches(
-            withText(
-              "Another important skill"
-            )
-          )
-        )
+        .check(matches(withText("Another important skill")))
+      onView(withId(R.id.concept_card_heading_text))
+        .inRoot(isDialog())
+        .check(matches(not(withText("An important skill"))))
       onView(withId(R.id.concept_card_explanation_text))
         .inRoot(isDialog())
-        .check(
-          matches(
-            withText(
-              "Explanation with rich text."
-            )
-          )
-        )
+        .check(matches(withText(containsString("Explanation with rich text."))))
       onView(withId(R.id.concept_card_explanation_text))
         .inRoot(isDialog())
         .check(matches(containsRichText()))
@@ -290,7 +269,29 @@ class ConceptCardFragmentTest {
   }
 
   @Test
-  fun testConceptCardFragment_openDialogFragmentWithSkill2_afterConfigurationChange_workedExamplesAreDisplayed() { // ktlint-disable max-line-length
+  fun testConceptCardFragment_openDialogFragment1_clickOnConceptCardLink_opensConceptCard() {
+    launchTestActivity().use {
+      onView(withId(R.id.open_dialog_1)).perform(click())
+      testCoroutineDispatchers.runCurrent()
+
+      // Click the concept card link to open it.
+      onView(withId(R.id.concept_card_explanation_text))
+        .inRoot(isDialog())
+        .perform(openClickableSpan("test_skill_id_0 concept card"))
+      testCoroutineDispatchers.runCurrent()
+
+      onView(withText("Concept Card")).inRoot(isDialog()).check(matches(isDisplayed()))
+      onView(withId(R.id.concept_card_heading_text))
+        .inRoot(isDialog())
+        .check(matches(withText("An important skill")))
+      onView(withId(R.id.concept_card_explanation_text))
+        .inRoot(isDialog())
+        .check(matches(withText(containsString("Hello. Welcome to Oppia."))))
+    }
+  }
+
+  @Test
+  fun testConceptCardFragment_openDialogFragmentWithSkill2_configChange_workedExamplesDisplayed() {
     launchTestActivity().use {
       onView(withId(R.id.open_dialog_1)).perform(click())
       testCoroutineDispatchers.runCurrent()
@@ -300,22 +301,10 @@ class ConceptCardFragmentTest {
 
       onView(withId(R.id.concept_card_heading_text))
         .inRoot(isDialog())
-        .check(
-          matches(
-            withText(
-              "Another important skill"
-            )
-          )
-        )
+        .check(matches(withText("Another important skill")))
       onView(withId(R.id.concept_card_explanation_text))
         .inRoot(isDialog())
-        .check(
-          matches(
-            withText(
-              "Explanation with rich text."
-            )
-          )
-        )
+        .check(matches(withText(containsString("Explanation with rich text."))))
       onView(withId(R.id.concept_card_explanation_text))
         .inRoot(isDialog())
         .check(matches(containsRichText()))
@@ -388,6 +377,43 @@ class ConceptCardFragmentTest {
     monitorFactory.waitForNextSuccessfulResult(updateProvider)
   }
 
+  private fun openClickableSpan(text: String): ViewAction {
+    return object : ViewAction {
+      override fun getDescription(): String = "openClickableSpan"
+
+      override fun getConstraints(): Matcher<View> = hasClickableSpanWithText(text)
+
+      override fun perform(uiController: UiController?, view: View?) {
+        // The view shouldn't be null if the constraints are being met.
+        (view as? TextView)?.getClickableSpans()?.findMatchingTextOrNull(text)?.onClick(view)
+      }
+    }
+  }
+
+  private fun hasClickableSpanWithText(text: String): Matcher<View> {
+    return object : TypeSafeMatcher<View>(TextView::class.java) {
+      override fun describeTo(description: Description?) {
+        description?.appendText("has ClickableSpan with text")?.appendValue(text)
+      }
+
+      override fun matchesSafely(item: View?): Boolean {
+        return (item as? TextView)?.getClickableSpans()?.findMatchingTextOrNull(text) != null
+      }
+    }
+  }
+
+  private fun TextView.getClickableSpans(): List<Pair<String, ClickableSpan>> {
+    val viewText = text
+    return (viewText as Spannable).getSpans(
+      /* start= */ 0, /* end= */ text.length, ClickableSpan::class.java
+    ).map {
+      viewText.subSequence(viewText.getSpanStart(it), viewText.getSpanEnd(it)).toString() to it
+    }
+  }
+
+  private fun List<Pair<String, ClickableSpan>>.findMatchingTextOrNull(text: String) =
+    find { text in it.first }?.second
+
   @Module
   class TestModule {
     @Provides
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 5589132a0f7..0f4b243d1cf 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
@@ -163,6 +163,10 @@ import java.util.Locale
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 import javax.inject.Singleton
+import android.text.style.ClickableSpan
+import androidx.test.espresso.UiController
+import android.text.Spannable
+import android.widget.TextView
 
 /**
  * Tests for [StateFragment] that can only be run locally, e.g. using Robolectric, and not on an
@@ -1740,6 +1744,49 @@ class StateFragmentLocalTest {
     }
   }
 
+  @Test
+  fun testStateFragment_openHint_clickConceptCardLink_opensConceptCard() {
+    launchForExploration(TEST_EXPLORATION_ID_2).use {
+      startPlayingExploration()
+      clickContinueButton()
+      submitTwoWrongAnswersToTestExpState2()
+      openHintsAndSolutionsDialog()
+      pressRevealHintButton(hintPosition = 0)
+
+      // Click on the link for opening the concept card.
+      onView(withId(R.id.hints_and_solution_summary))
+        .inRoot(isDialog())
+        .perform(openClickableSpan("test_skill_id_1 concept card"))
+      testCoroutineDispatchers.runCurrent()
+
+      onView(withText("Concept Card")).inRoot(isDialog()).check(matches(isDisplayed()))
+      onView(withId(R.id.concept_card_heading_text))
+        .inRoot(isDialog())
+        .check(matches(withText("Another important skill")))
+    }
+  }
+
+  @Test
+  fun testStateFragment_openSolution_clickConceptCardLink_opensConceptCard() {
+    launchForExploration(TEST_EXPLORATION_ID_2).use { scenario ->
+      startPlayingExploration()
+      clickContinueButton()
+      produceAndViewNextHint(hintPosition = 0) { submitTwoWrongAnswersToTestExpState2() }
+      produceAndViewSolution(scenario) { submitWrongAnswerToTestExpState2() }
+
+      // Click on the link for opening the concept card.
+      onView(withId(R.id.solution_summary))
+        .inRoot(isDialog())
+        .perform(openClickableSpan("test_skill_id_1 concept card"))
+      testCoroutineDispatchers.runCurrent()
+
+      onView(withText("Concept Card")).inRoot(isDialog()).check(matches(isDisplayed()))
+      onView(withId(R.id.concept_card_heading_text))
+        .inRoot(isDialog())
+        .check(matches(withText("Another important skill")))
+    }
+  }
+
   private fun createAudioUrl(explorationId: String, audioFileName: String): String {
     return "https://storage.googleapis.com/oppiaserver-resources/" +
       "exploration/$explorationId/assets/audio/$audioFileName"
@@ -2091,6 +2138,15 @@ class StateFragmentLocalTest {
     )
   }
 
+  private fun submitWrongAnswerToTestExpState2() {
+    submitFractionAnswer(answerText = "1/4")
+  }
+
+  private fun submitTwoWrongAnswersToTestExpState2() {
+    submitWrongAnswerToTestExpState2()
+    submitWrongAnswerToTestExpState2()
+  }
+
   /**
    * Causes a hint after the first one to be shown (at approximately the specified recycler view
    * index for scrolling purposes), and then reveals it and closes the hints & solutions dialog.
@@ -2102,6 +2158,16 @@ class StateFragmentLocalTest {
     closeHintsAndSolutionsDialog()
   }
 
+  private fun produceAndViewSolution(
+    activityScenario: ActivityScenario<StateFragmentTestActivity>, submitAnswer: () -> Unit
+  ) {
+    submitAnswer()
+    testCoroutineDispatchers.advanceTimeBy(TimeUnit.SECONDS.toMillis(10))
+    openHintsAndSolutionsDialog()
+    showRevealSolutionDialog()
+    clickConfirmRevealSolutionButton(activityScenario)
+  }
+
   private fun produceAndViewThreeHintsInFractionsState13() {
     submitWrongAnswerToFractionsState13()
     produceAndViewNextHint(
@@ -2250,6 +2316,43 @@ class StateFragmentLocalTest {
       })
   }
 
+  private fun openClickableSpan(text: String): ViewAction {
+    return object : ViewAction {
+      override fun getDescription(): String = "openClickableSpan"
+
+      override fun getConstraints(): Matcher<View> = hasClickableSpanWithText(text)
+
+      override fun perform(uiController: UiController?, view: View?) {
+        // The view shouldn't be null if the constraints are being met.
+        (view as? TextView)?.getClickableSpans()?.findMatchingTextOrNull(text)?.onClick(view)
+      }
+    }
+  }
+
+  private fun hasClickableSpanWithText(text: String): Matcher<View> {
+    return object : TypeSafeMatcher<View>(TextView::class.java) {
+      override fun describeTo(description: Description?) {
+        description?.appendText("has ClickableSpan with text")?.appendValue(text)
+      }
+
+      override fun matchesSafely(item: View?): Boolean {
+        return (item as? TextView)?.getClickableSpans()?.findMatchingTextOrNull(text) != null
+      }
+    }
+  }
+
+  private fun TextView.getClickableSpans(): List<Pair<String, ClickableSpan>> {
+    val viewText = text
+    return (viewText as Spannable).getSpans(
+      /* start= */ 0, /* end= */ text.length, ClickableSpan::class.java
+    ).map {
+      viewText.subSequence(viewText.getSpanStart(it), viewText.getSpanEnd(it)).toString() to it
+    }
+  }
+
+  private fun List<Pair<String, ClickableSpan>>.findMatchingTextOrNull(text: String) =
+    find { text in it.first }?.second
+
   // TODO(#89): Move this to a common test application component.
   @Module
   class TestModule {
diff --git a/domain/src/main/assets/skills.json b/domain/src/main/assets/skills.json
index 8bf249793b0..871db18559a 100644
--- a/domain/src/main/assets/skills.json
+++ b/domain/src/main/assets/skills.json
@@ -130,7 +130,7 @@
     "skill_contents": {
       "explanation": {
         "content_id": "explanation",
-        "html": "Explanation with <b>rich text</b>."
+        "html": "Explanation with <b>rich text</b>.<p>Click on this <oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;test_skill_id_0&amp;quot;\" text-with-value=\"&amp;quot;test_skill_id_0 concept card&amp;quot;\"></oppia-noninteractive-skillreview>.</p>"
       },
       "worked_examples": [{
         "question": {
diff --git a/domain/src/main/assets/skills.textproto b/domain/src/main/assets/skills.textproto
index cb1b7396271..7bdd492fcd2 100644
--- a/domain/src/main/assets/skills.textproto
+++ b/domain/src/main/assets/skills.textproto
@@ -152,7 +152,7 @@ concept_cards {
   skill_id: "test_skill_id_1"
   skill_description: "Another important skill"
   explanation {
-    html: "Explanation with <b>rich text</b>."
+    html: "Explanation with <b>rich text</b>.<p>Click on this <oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;test_skill_id_0&amp;quot;\" text-with-value=\"&amp;quot;test_skill_id_0 concept card&amp;quot;\"></oppia-noninteractive-skillreview>.</p>"
     content_id: "explanation"
   }
   worked_example {
diff --git a/domain/src/main/assets/test_exp_id_2.json b/domain/src/main/assets/test_exp_id_2.json
index 49e1dfc7495..e52d6fe3f3b 100644
--- a/domain/src/main/assets/test_exp_id_2.json
+++ b/domain/src/main/assets/test_exp_id_2.json
@@ -444,7 +444,7 @@
           "hints": [{
             "hint_content": {
               "content_id": "hint_1",
-              "html": "<p>Remember that two halves, when added together, make one whole.</p>"
+              "html": "<p>Remember that two halves, when added together, make one whole.</p><p>Click on this <oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;test_skill_id_1&amp;quot;\" text-with-value=\"&amp;quot;test_skill_id_1 concept card&amp;quot;\"></oppia-noninteractive-skillreview>.</p>"
             }
           }],
           "solution": {
@@ -457,7 +457,7 @@
             },
             "explanation": {
               "content_id": "solution",
-              "html": "<p>Half of something has one part in the numerator for every two parts in the denominator.</p>"
+              "html": "<p>Half of something has one part in the numerator for every two parts in the denominator.</p><p>Click on this <oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;test_skill_id_1&amp;quot;\" text-with-value=\"&amp;quot;test_skill_id_1 concept card&amp;quot;\"></oppia-noninteractive-skillreview>.</p>"
             }
           }
         },
diff --git a/domain/src/main/assets/test_exp_id_2.textproto b/domain/src/main/assets/test_exp_id_2.textproto
index d7882d51023..1392b92423d 100644
--- a/domain/src/main/assets/test_exp_id_2.textproto
+++ b/domain/src/main/assets/test_exp_id_2.textproto
@@ -682,13 +682,13 @@ states {
           numerator: 1
         }
         explanation {
-          html: "<p>Half of something has one part in the numerator for every two parts in the denominator.</p>"
+          html: "<p>Half of something has one part in the numerator for every two parts in the denominator.</p><p>Click on this <oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;test_skill_id_1&amp;quot;\" text-with-value=\"&amp;quot;test_skill_id_1 concept card&amp;quot;\"></oppia-noninteractive-skillreview>.</p>"
           content_id: "solution"
         }
       }
       hint {
         hint_content {
-          html: "<p>Remember that two halves, when added together, make one whole.</p>"
+          html: "<p>Remember that two halves, when added together, make one whole.</p><p>Click on this <oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;test_skill_id_1&amp;quot;\" text-with-value=\"&amp;quot;test_skill_id_1 concept card&amp;quot;\"></oppia-noninteractive-skillreview>.</p>"
           content_id: "hint_1"
         }
       }
diff --git a/utility/src/main/java/org/oppia/android/util/caching/CachingModule.kt b/utility/src/main/java/org/oppia/android/util/caching/CachingModule.kt
index 0979764b659..172a6f8a979 100644
--- a/utility/src/main/java/org/oppia/android/util/caching/CachingModule.kt
+++ b/utility/src/main/java/org/oppia/android/util/caching/CachingModule.kt
@@ -19,7 +19,7 @@ class CachingModule {
 
   @Provides
   @LoadLessonProtosFromAssets
-  fun provideLoadLessonProtosFromAssets(): Boolean = false
+  fun provideLoadLessonProtosFromAssets(): Boolean = true
 
   @Provides
   @LoadImagesFromAssets

From 76d38ed882a9a895c3c0eb81110cbd4e5fd86407 Mon Sep 17 00:00:00 2001
From: Ben Henning <ben@oppia.org>
Date: Wed, 24 Aug 2022 13:43:16 -0500
Subject: [PATCH 03/38] Lint fixes.

---
 .../HintsAndSolutionDialogFragment.kt          |  2 +-
 .../HintsAndSolutionDialogFragmentPresenter.kt |  4 ++--
 .../player/exploration/ExplorationActivity.kt  |  2 +-
 .../state/testing/StateFragmentTestActivity.kt |  2 +-
 .../questionplayer/QuestionPlayerActivity.kt   |  2 --
 .../QuestionPlayerActivityPresenter.kt         | 10 +++++-----
 .../conceptcard/ConceptCardFragmentTest.kt     | 18 +++++++++---------
 .../app/player/state/StateFragmentLocalTest.kt | 11 ++++++-----
 8 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragment.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragment.kt
index fb803de04cc..532b1dac6b4 100644
--- a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragment.kt
+++ b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragment.kt
@@ -9,13 +9,13 @@ import org.oppia.android.R
 import org.oppia.android.app.fragment.FragmentComponentImpl
 import org.oppia.android.app.fragment.InjectableDialogFragment
 import org.oppia.android.app.model.HelpIndex
+import org.oppia.android.app.model.ProfileId
 import org.oppia.android.app.model.State
 import org.oppia.android.app.model.WrittenTranslationContext
 import org.oppia.android.util.extensions.getProto
 import org.oppia.android.util.extensions.getStringFromBundle
 import org.oppia.android.util.extensions.putProto
 import javax.inject.Inject
-import org.oppia.android.app.model.ProfileId
 
 private const val CURRENT_EXPANDED_ITEMS_LIST_SAVED_KEY =
   "HintsAndSolutionDialogFragment.current_expanded_list_index"
diff --git a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragmentPresenter.kt
index 33ed5eb9878..e96df7fec97 100644
--- a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragmentPresenter.kt
@@ -11,9 +11,11 @@ import org.oppia.android.app.model.HelpIndex.IndexTypeCase.EVERYTHING_REVEALED
 import org.oppia.android.app.model.HelpIndex.IndexTypeCase.LATEST_REVEALED_HINT_INDEX
 import org.oppia.android.app.model.HelpIndex.IndexTypeCase.NEXT_AVAILABLE_HINT_INDEX
 import org.oppia.android.app.model.HelpIndex.IndexTypeCase.SHOW_SOLUTION
+import org.oppia.android.app.model.ProfileId
 import org.oppia.android.app.model.State
 import org.oppia.android.app.model.WrittenTranslationContext
 import org.oppia.android.app.recyclerview.BindableAdapter
+import org.oppia.android.app.topic.conceptcard.ConceptCardFragment
 import org.oppia.android.app.translation.AppLanguageResourceHandler
 import org.oppia.android.app.viewmodel.ViewModelProvider
 import org.oppia.android.databinding.HintsAndSolutionFragmentBinding
@@ -25,8 +27,6 @@ import org.oppia.android.util.parser.html.ExplorationHtmlParserEntityType
 import org.oppia.android.util.parser.html.HtmlParser
 import java.lang.IllegalStateException
 import javax.inject.Inject
-import org.oppia.android.app.model.ProfileId
-import org.oppia.android.app.topic.conceptcard.ConceptCardFragment
 
 const val TAG_REVEAL_SOLUTION_DIALOG = "REVEAL_SOLUTION_DIALOG"
 
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 3fb3feffbe2..2974ee95b87 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
@@ -13,6 +13,7 @@ import org.oppia.android.app.hintsandsolution.HintsAndSolutionListener
 import org.oppia.android.app.hintsandsolution.RevealHintListener
 import org.oppia.android.app.hintsandsolution.RevealSolutionInterface
 import org.oppia.android.app.model.HelpIndex
+import org.oppia.android.app.model.ProfileId
 import org.oppia.android.app.model.ReadingTextSize
 import org.oppia.android.app.model.State
 import org.oppia.android.app.model.WrittenTranslationContext
@@ -22,7 +23,6 @@ import org.oppia.android.app.player.state.listener.StateKeyboardButtonListener
 import org.oppia.android.app.player.stopplaying.StopStatePlayingSessionWithSavedProgressListener
 import org.oppia.android.app.topic.conceptcard.ConceptCardListener
 import javax.inject.Inject
-import org.oppia.android.app.model.ProfileId
 
 const val TAG_HINTS_AND_SOLUTION_DIALOG = "HINTS_AND_SOLUTION_DIALOG"
 
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 6a2117728c6..a7cc03bd0ac 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
@@ -10,6 +10,7 @@ import org.oppia.android.app.hintsandsolution.HintsAndSolutionListener
 import org.oppia.android.app.hintsandsolution.RevealHintListener
 import org.oppia.android.app.hintsandsolution.RevealSolutionInterface
 import org.oppia.android.app.model.HelpIndex
+import org.oppia.android.app.model.ProfileId
 import org.oppia.android.app.model.State
 import org.oppia.android.app.model.WrittenTranslationContext
 import org.oppia.android.app.player.audio.AudioButtonListener
@@ -19,7 +20,6 @@ import org.oppia.android.app.player.state.listener.RouteToHintsAndSolutionListen
 import org.oppia.android.app.player.state.listener.StateKeyboardButtonListener
 import org.oppia.android.app.player.stopplaying.StopStatePlayingSessionWithSavedProgressListener
 import javax.inject.Inject
-import org.oppia.android.app.model.ProfileId
 
 internal const val TEST_ACTIVITY_PROFILE_ID_EXTRA_KEY =
   "StateFragmentTestActivity.test_activity_profile_id"
diff --git a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivity.kt b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivity.kt
index 4ac9df43fe8..bcc747aecb8 100644
--- a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivity.kt
@@ -5,7 +5,6 @@ import android.content.Intent
 import android.os.Bundle
 import org.oppia.android.app.activity.ActivityComponentImpl
 import org.oppia.android.app.activity.InjectableAppCompatActivity
-import org.oppia.android.app.hintsandsolution.HintsAndSolutionDialogFragment
 import org.oppia.android.app.hintsandsolution.HintsAndSolutionListener
 import org.oppia.android.app.hintsandsolution.RevealHintListener
 import org.oppia.android.app.hintsandsolution.RevealSolutionInterface
@@ -13,7 +12,6 @@ import org.oppia.android.app.model.HelpIndex
 import org.oppia.android.app.model.ProfileId
 import org.oppia.android.app.model.State
 import org.oppia.android.app.model.WrittenTranslationContext
-import org.oppia.android.app.player.exploration.TAG_HINTS_AND_SOLUTION_DIALOG
 import org.oppia.android.app.player.state.listener.RouteToHintsAndSolutionListener
 import org.oppia.android.app.player.state.listener.StateKeyboardButtonListener
 import org.oppia.android.app.player.stopplaying.RestartPlayingSessionListener
diff --git a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityPresenter.kt
index 2d37b395747..b9685035387 100644
--- a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityPresenter.kt
@@ -5,18 +5,18 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.databinding.DataBindingUtil
 import org.oppia.android.R
 import org.oppia.android.app.activity.ActivityScope
+import org.oppia.android.app.hintsandsolution.HintsAndSolutionDialogFragment
+import org.oppia.android.app.model.HelpIndex
 import org.oppia.android.app.model.ProfileId
+import org.oppia.android.app.model.State
+import org.oppia.android.app.model.WrittenTranslationContext
+import org.oppia.android.app.player.exploration.TAG_HINTS_AND_SOLUTION_DIALOG
 import org.oppia.android.databinding.QuestionPlayerActivityBinding
 import org.oppia.android.domain.oppialogger.OppiaLogger
 import org.oppia.android.domain.question.QuestionTrainingController
 import org.oppia.android.util.data.AsyncResult
 import org.oppia.android.util.data.DataProviders.Companion.toLiveData
 import javax.inject.Inject
-import org.oppia.android.app.hintsandsolution.HintsAndSolutionDialogFragment
-import org.oppia.android.app.model.HelpIndex
-import org.oppia.android.app.model.State
-import org.oppia.android.app.model.WrittenTranslationContext
-import org.oppia.android.app.player.exploration.TAG_HINTS_AND_SOLUTION_DIALOG
 
 const val TAG_QUESTION_PLAYER_FRAGMENT = "TAG_QUESTION_PLAYER_FRAGMENT"
 private const val TAG_HINTS_AND_SOLUTION_QUESTION_MANAGER = "HINTS_AND_SOLUTION_QUESTION_MANAGER"
diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentTest.kt
index 59437fa016c..99f298f2b21 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentTest.kt
@@ -2,18 +2,22 @@ package org.oppia.android.app.topic.conceptcard
 
 import android.app.Application
 import android.content.Context
-import android.widget.TextView
+import android.text.Spannable
+import android.text.style.ClickableSpan
 import android.view.View
+import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.test.core.app.ActivityScenario
-import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.UiController
+import androidx.test.espresso.ViewAction
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.doesNotExist
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.intent.Intents
 import androidx.test.espresso.matcher.RootMatchers.isDialog
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.isRoot
 import androidx.test.espresso.matcher.ViewMatchers.withContentDescription
 import androidx.test.espresso.matcher.ViewMatchers.withId
@@ -24,9 +28,12 @@ import dagger.Component
 import dagger.Module
 import dagger.Provides
 import org.hamcrest.CoreMatchers.containsString
+import org.hamcrest.Description
+import org.hamcrest.Matcher
 import org.hamcrest.Matchers.allOf
 import org.hamcrest.Matchers.instanceOf
 import org.hamcrest.Matchers.not
+import org.hamcrest.TypeSafeMatcher
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
@@ -114,13 +121,6 @@ import org.robolectric.annotation.Config
 import org.robolectric.annotation.LooperMode
 import javax.inject.Inject
 import javax.inject.Singleton
-import android.text.style.ClickableSpan
-import androidx.test.espresso.UiController
-import androidx.test.espresso.ViewAction
-import org.hamcrest.Description
-import org.hamcrest.Matcher
-import org.hamcrest.TypeSafeMatcher
-import android.text.Spannable
 
 /** Tests for [ConceptCardFragment]. */
 @RunWith(AndroidJUnit4::class)
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 0f4b243d1cf..e4b1d349632 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
@@ -2,8 +2,11 @@ package org.oppia.android.app.player.state
 
 import android.app.Application
 import android.content.Context
+import android.text.Spannable
+import android.text.style.ClickableSpan
 import android.view.View
 import android.view.ViewGroup
+import android.widget.TextView
 import androidx.annotation.IdRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.children
@@ -14,6 +17,7 @@ import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.Espresso.pressBack
 import androidx.test.espresso.PerformException
+import androidx.test.espresso.UiController
 import androidx.test.espresso.ViewAction
 import androidx.test.espresso.ViewAssertion
 import androidx.test.espresso.action.ViewActions.click
@@ -163,10 +167,6 @@ import java.util.Locale
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 import javax.inject.Singleton
-import android.text.style.ClickableSpan
-import androidx.test.espresso.UiController
-import android.text.Spannable
-import android.widget.TextView
 
 /**
  * Tests for [StateFragment] that can only be run locally, e.g. using Robolectric, and not on an
@@ -2159,7 +2159,8 @@ class StateFragmentLocalTest {
   }
 
   private fun produceAndViewSolution(
-    activityScenario: ActivityScenario<StateFragmentTestActivity>, submitAnswer: () -> Unit
+    activityScenario: ActivityScenario<StateFragmentTestActivity>,
+    submitAnswer: () -> Unit
   ) {
     submitAnswer()
     testCoroutineDispatchers.advanceTimeBy(TimeUnit.SECONDS.toMillis(10))

From 94a4140aa5a587fbf4da1473fc571f63fd85f619 Mon Sep 17 00:00:00 2001
From: Ben Henning <ben@oppia.org>
Date: Wed, 24 Aug 2022 22:46:30 -0500
Subject: [PATCH 04/38] Revert flag enabled for development.

---
 .../main/java/org/oppia/android/util/caching/CachingModule.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utility/src/main/java/org/oppia/android/util/caching/CachingModule.kt b/utility/src/main/java/org/oppia/android/util/caching/CachingModule.kt
index 172a6f8a979..0979764b659 100644
--- a/utility/src/main/java/org/oppia/android/util/caching/CachingModule.kt
+++ b/utility/src/main/java/org/oppia/android/util/caching/CachingModule.kt
@@ -19,7 +19,7 @@ class CachingModule {
 
   @Provides
   @LoadLessonProtosFromAssets
-  fun provideLoadLessonProtosFromAssets(): Boolean = true
+  fun provideLoadLessonProtosFromAssets(): Boolean = false
 
   @Provides
   @LoadImagesFromAssets

From 19f0e697056f836124afc35927ad8fb854970043 Mon Sep 17 00:00:00 2001
From: Ben Henning <ben@oppia.org>
Date: Thu, 12 Jan 2023 14:04:48 -0800
Subject: [PATCH 05/38] Fixes a few things for the upcoming MR6 release.

Fixes:
- Removed extra spacing around a few Swahili strings (all should now be
fixed).
- Replaced 'reveal' English wording with 'show'.
- Added a new event for logging voiceover pausing.
- Updated the play/pause voiceover events to include language codes.

Documentation and/or tests may not yet be completed.
---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../app/player/audio/AudioViewModel.kt        |  8 +++---
 app/src/main/res/values-sw/strings.xml        | 14 +++++-----
 app/src/main/res/values/strings.xml           |  8 +++---
 .../domain/audio/AudioPlayerController.kt     | 21 ++++++++++++---
 .../analytics/LearnerAnalyticsLogger.kt       | 26 ++++++++++++++++---
 model/src/main/proto/oppia_logger.proto       | 10 +++++++
 .../util/logging/EventBundleCreator.kt        |  9 ++++---
 ...entTypeToHumanReadableNameConverterImpl.kt |  1 +
 ...entTypeToHumanReadableNameConverterImpl.kt |  1 +
 10 files changed, 73 insertions(+), 27 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0c112106d33..6c3512d1552 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -18,7 +18,7 @@
     <!-- NOTE TO DEVELOPER: You can enable debug logs for fast upload & better inspection in Firebase console using https://support.google.com/analytics/answer/7201382. -->
     <meta-data
       android:name="firebase_analytics_collection_deactivated"
-      android:value="true" />
+      android:value="false" />
     <meta-data
       android:name="firebase_crashlytics_collection_enabled"
       android:value="false" />
diff --git a/app/src/main/java/org/oppia/android/app/player/audio/AudioViewModel.kt b/app/src/main/java/org/oppia/android/app/player/audio/AudioViewModel.kt
index 8de03ce0ca3..33708dcebb9 100644
--- a/app/src/main/java/org/oppia/android/app/player/audio/AudioViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/player/audio/AudioViewModel.kt
@@ -117,7 +117,7 @@ class AudioViewModel @Inject constructor(
         val ensuredLanguageCode = if (languages.contains("en")) "en" else languages.first()
         fallbackLanguageCode = ensuredLanguageCode
         audioPlayerController.changeDataSource(
-          voiceOverToUri(voiceoverMap[ensuredLanguageCode]), currentContentId
+          voiceOverToUri(voiceoverMap[ensuredLanguageCode]), currentContentId, ensuredLanguageCode
         )
       }
     }
@@ -128,20 +128,20 @@ class AudioViewModel @Inject constructor(
     selectedLanguageCode = languageCode
     currentLanguageCode.set(languageCode)
     audioPlayerController.changeDataSource(
-      voiceOverToUri(voiceoverMap[languageCode]), currentContentId
+      voiceOverToUri(voiceoverMap[languageCode]), currentContentId, languageCode
     )
   }
 
   /** Plays or pauses AudioController depending on passed in state */
   fun togglePlayPause(type: UiAudioPlayStatus?) {
     if (type == UiAudioPlayStatus.PLAYING) {
-      audioPlayerController.pause()
+      audioPlayerController.pause(isFromExplicitUserAction = true)
     } else {
       audioPlayerController.play(isPlayingFromAutoPlay = false, reloadingMainContent = false)
     }
   }
 
-  fun pauseAudio() = audioPlayerController.pause()
+  fun pauseAudio() = audioPlayerController.pause(isFromExplicitUserAction = false)
   fun handleSeekTo(position: Int) = audioPlayerController.seekTo(position)
   fun handleRelease() = audioPlayerController.releaseMediaPlayer()
 
diff --git a/app/src/main/res/values-sw/strings.xml b/app/src/main/res/values-sw/strings.xml
index 3a7be1bece1..06b45cdc46c 100644
--- a/app/src/main/res/values-sw/strings.xml
+++ b/app/src/main/res/values-sw/strings.xml
@@ -158,7 +158,7 @@
   <string name="ratio_error_invalid_size">Idadi ya masharti si sawa na masharti yanayohitajika.</string>
   <string name="ratio_error_includes_zero">Uwiano hauwezi kuwa na 0 kama kipengele.</string>
   <string name="unknown_size">Ukubwa usiojulikana</string>
-  <string name="size_bytes"> Baiti %s</string>
+  <string name="size_bytes">Baiti %s</string>
   <string name="size_kb">%s KB</string>
   <string name="size_mb">%s MB</string>
   <string name="size_gb">%s GB</string>
@@ -166,20 +166,20 @@
   <string name="topic_prefix">Mada: %s</string>
   <string name="chapter_count_with_story_name">%1$s katika %2$s</string>
   <plurals name="chapter_count">
-    <item quantity="one">Sura 1\n    </item>
-    <item quantity="other">\n      Sura %s \n    </item>
+    <item quantity="one">Sura 1</item>
+    <item quantity="other">Sura %s</item>
   </plurals>
   <plurals name="story_count">
-    <item quantity="one">Hadithi 1\n    </item>
-    <item quantity="other">      Hadithi %s\n    </item>
+    <item quantity="one">Hadithi 1</item>
+    <item quantity="other">Hadithi %s</item>
   </plurals>
   <plurals name="story_total_chapters">
     <item quantity="one">%s kati ya Sura %s Imekamilika</item>
     <item quantity="other">%s ya Sura %s Imekamilika</item>
   </plurals>
   <plurals name="lesson_count">
-    <item quantity="one">Somo 1\n    </item>
-    <item quantity="other">      Masomo %s \n    </item>
+    <item quantity="one">Somo 1</item>
+    <item quantity="other">Masomo %s</item>
   </plurals>
   <string name="profile_chooser_activity_label">Ukurasa wa kuchagua wasifu</string>
   <string name="profile_chooser_admin">Msimamizi</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 073d27dcaf3..c08f86fc988 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -452,13 +452,13 @@
   <string name="hints_andSolution_close_icon_description">Navigate up</string>
   <string name="hints_toolbar_title">Hints</string>
   <string name="show_solution">Show solution</string>
-  <string name="reveal_solution">Reveal Solution</string>
+  <string name="reveal_solution">Show Solution</string>
   <string name="reveal_hint">Show Hint</string>
   <string name="hide_hint">Hide Hint</string>
   <string name="hide_solution">Hide solution</string>
-  <string name="the_only_solution_is">The only solution is :  </string>
-  <string name="this_will_reveal_the_solution">This will reveal the solution. Are you sure?</string>
-  <string name="reveal">Reveal</string>
+  <string name="the_only_solution_is">The only solution is:</string>
+  <string name="this_will_reveal_the_solution">This will show the solution. Are you sure?</string>
+  <string name="reveal">Show</string>
   <!-- TextViewBindingAdapters -->
   <string name="just_now">just now</string>
   <string name="last_logged_in_recently">recently</string>
diff --git a/domain/src/main/java/org/oppia/android/domain/audio/AudioPlayerController.kt b/domain/src/main/java/org/oppia/android/domain/audio/AudioPlayerController.kt
index 98940dd6536..b0c30755cfd 100644
--- a/domain/src/main/java/org/oppia/android/domain/audio/AudioPlayerController.kt
+++ b/domain/src/main/java/org/oppia/android/domain/audio/AudioPlayerController.kt
@@ -91,6 +91,7 @@ class AudioPlayerController @Inject constructor(
   private var duration = 0
   private var completed = false
   private var currentContentId: String? = null
+  private var currentLanguageCode: String? = null
 
   private val SEEKBAR_UPDATE_FREQUENCY = TimeUnit.SECONDS.toMillis(1)
 
@@ -117,10 +118,11 @@ class AudioPlayerController @Inject constructor(
    * Changes audio source to specified.
    * Stops sending seek bar updates and put MediaPlayer in preparing state.
    */
-  fun changeDataSource(url: String, contentId: String?) {
+  fun changeDataSource(url: String, contentId: String?, languageCode: String) {
     audioLock.withLock {
       prepared = false
       currentContentId = contentId
+      currentLanguageCode = languageCode
       stopUpdatingSeekBar()
       mediaPlayer.reset()
       prepareDataSource(url)
@@ -210,7 +212,7 @@ class AudioPlayerController @Inject constructor(
         if (!isPlayingFromAutoPlay || !reloadingMainContent) {
           val explorationLogger = learnerAnalyticsLogger.explorationAnalyticsLogger.value
           val stateLogger = explorationLogger?.stateAnalyticsLogger?.value
-          stateLogger?.logPlayVoiceOver(currentContentId)
+          stateLogger?.logPlayVoiceOver(currentContentId, currentLanguageCode)
         }
       }
     }
@@ -218,9 +220,14 @@ class AudioPlayerController @Inject constructor(
 
   /**
    * Puts MediaPlayer in paused state and stops sending seek bar updates.
-   * Controller must already have audio prepared.
+   *
+   * The controller must already have audio prepared.
+   *
+   * @param isFromExplicitUserAction indicates whether this pause is from an explicit user action
+   *     (like clicking a pause button) vs. an incidental one (like an autoplay transition or
+   *     closing the audio bar)
    */
-  fun pause() {
+  fun pause(isFromExplicitUserAction: Boolean) {
     audioLock.withLock {
       check(prepared) { "Media Player not in a prepared state" }
       if (mediaPlayer.isPlaying) {
@@ -230,6 +237,12 @@ class AudioPlayerController @Inject constructor(
           )
         mediaPlayer.pause()
         stopUpdatingSeekBar()
+
+        if (isFromExplicitUserAction) {
+          val explorationLogger = learnerAnalyticsLogger.explorationAnalyticsLogger.value
+          val stateLogger = explorationLogger?.stateAnalyticsLogger?.value
+          stateLogger?.logPauseVoiceOver(currentContentId, currentLanguageCode)
+        }
       }
     }
   }
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 727b53dc722..d30bf80de40 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
@@ -377,11 +377,27 @@ class LearnerAnalyticsLogger @Inject constructor(
 
     /**
      * Logs that the learner started playing a voice over audio track corresponding to [contentId]
-     * (or null if something failed when retrieving the content ID--note that this may affect
-     * whether the event is logged).
+     * with language code [languageCode] (or null if something failed when retrieving the content ID
+     * or language code--note that this may affect whether the event is logged).
      */
-    fun logPlayVoiceOver(contentId: String?) {
-      logStateEvent(contentId, ::createPlayVoiceOverContext, EventBuilder::setPlayVoiceOverContext)
+    fun logPlayVoiceOver(contentId: String?, languageCode: String?) {
+      logStateEvent(
+        contentId, languageCode, ::createPlayVoiceOverContext, EventBuilder::setPlayVoiceOverContext
+      )
+    }
+
+    /**
+     * Logs that the learner stopped playing a voice over audio track corresponding to [contentId]
+     * with language code [languageCode] (see [logPlayVoiceOver] for caveats for both [contentId]
+     * and [languageCode]).
+     */
+    fun logPauseVoiceOver(contentId: String?, languageCode: String?) {
+      logStateEvent(
+        contentId,
+        languageCode,
+        ::createPlayVoiceOverContext,
+        EventBuilder::setPauseVoiceOverContext
+      )
     }
 
     /**
@@ -538,9 +554,11 @@ class LearnerAnalyticsLogger @Inject constructor(
 
     private fun createPlayVoiceOverContext(
       contentId: String?,
+      languageCode: String?,
       explorationDetails: ExplorationContext
     ) = PlayVoiceOverContext.newBuilder().apply {
       contentId?.let { this.contentId = it }
+      languageCode?.let { this.languageCode = languageCode }
       this.explorationDetails = explorationDetails
     }.build()
 
diff --git a/model/src/main/proto/oppia_logger.proto b/model/src/main/proto/oppia_logger.proto
index 6f2a37fdd2f..62f77ee3284 100644
--- a/model/src/main/proto/oppia_logger.proto
+++ b/model/src/main/proto/oppia_logger.proto
@@ -94,6 +94,9 @@ message EventLog {
       // The event being logged is related to playing a voiceover.
       PlayVoiceOverContext play_voice_over_context = 23;
 
+      // The event being logged is related to pausing a voiceover.
+      PlayVoiceOverContext pause_voice_over_context = 35;
+
       // The event being logged is related to backgrounding of the application.
       LearnerDetailsContext app_in_background_context = 24;
 
@@ -207,8 +210,15 @@ message EventLog {
     // Defined attributes that are common among other exploration related event log contexts.
     ExplorationContext exploration_details = 1;
 
+    // Not sure if this was ever actually a value, but reserving it to ensure no incompatibilities
+    // occur.
+    reserved 2;
+
     // The content id of the voiceover recording being played.
     string content_id = 3;
+
+    // The language code being played.
+    string language_code = 4;
   }
 
   // Represents event context which contains learner-specific details that are logged with every
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 db860e80ed0..ed2fc66b2bd 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
@@ -51,7 +51,7 @@ import org.oppia.android.util.logging.EventBundleCreator.EventActivityContext.Em
 import org.oppia.android.util.logging.EventBundleCreator.EventActivityContext.ExplorationContext
 import org.oppia.android.util.logging.EventBundleCreator.EventActivityContext.HintContext
 import org.oppia.android.util.logging.EventBundleCreator.EventActivityContext.LearnerDetailsContext
-import org.oppia.android.util.logging.EventBundleCreator.EventActivityContext.PlayVoiceOverContext
+import org.oppia.android.util.logging.EventBundleCreator.EventActivityContext.PlayPauseVoiceOverContext
 import org.oppia.android.util.logging.EventBundleCreator.EventActivityContext.QuestionContext
 import org.oppia.android.util.logging.EventBundleCreator.EventActivityContext.RevisionCardContext
 import org.oppia.android.util.logging.EventBundleCreator.EventActivityContext.SensitiveStringContext
@@ -70,6 +70,7 @@ import javax.inject.Inject
 import javax.inject.Singleton
 import org.oppia.android.app.model.EventLog.CardContext as CardEventContext
 import org.oppia.android.app.model.EventLog.ConceptCardContext as ConceptCardEventContext
+import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.PAUSE_VOICE_OVER_CONTEXT
 import org.oppia.android.app.model.EventLog.ExplorationContext as ExplorationEventContext
 import org.oppia.android.app.model.EventLog.HintContext as HintEventContext
 import org.oppia.android.app.model.EventLog.LearnerDetailsContext as LearnerDetailsEventContext
@@ -164,7 +165,8 @@ class EventBundleCreator @Inject constructor(
       SOLUTION_OFFERED_CONTEXT -> ExplorationContext(activityName, solutionOfferedContext)
       ACCESS_SOLUTION_CONTEXT -> ExplorationContext(activityName, accessSolutionContext)
       SUBMIT_ANSWER_CONTEXT -> SubmitAnswerContext(activityName, submitAnswerContext)
-      PLAY_VOICE_OVER_CONTEXT -> PlayVoiceOverContext(activityName, playVoiceOverContext)
+      PLAY_VOICE_OVER_CONTEXT -> PlayPauseVoiceOverContext(activityName, playVoiceOverContext)
+      PAUSE_VOICE_OVER_CONTEXT -> PlayPauseVoiceOverContext(activityName, pauseVoiceOverContext)
       APP_IN_BACKGROUND_CONTEXT -> LearnerDetailsContext(activityName, appInBackgroundContext)
       APP_IN_FOREGROUND_CONTEXT -> LearnerDetailsContext(activityName, appInForegroundContext)
       EXIT_EXPLORATION_CONTEXT -> ExplorationContext(activityName, exitExplorationContext)
@@ -364,13 +366,14 @@ class EventBundleCreator @Inject constructor(
     }
 
     /** The [EventActivityContext] corresponding to [PlayVoiceOverEventContext]s. */
-    class PlayVoiceOverContext(
+    class PlayPauseVoiceOverContext(
       activityName: String,
       value: PlayVoiceOverEventContext
     ) : EventActivityContext<PlayVoiceOverEventContext>(activityName, value) {
       override fun PlayVoiceOverEventContext.storeValue(store: PropertyStore) {
         store.putProperties("exploration_details", explorationDetails, ::ExplorationContext)
         store.putNonSensitiveValue("content_id", contentId)
+        store.putNonSensitiveValue("language_code", languageCode)
       }
     }
 
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 9c5fd669585..d0ccb5d228e 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
@@ -32,6 +32,7 @@ class KenyaAlphaEventTypeToHumanReadableNameConverterImpl @Inject constructor()
       ActivityContextCase.ACCESS_SOLUTION_CONTEXT -> "access_solution_context"
       ActivityContextCase.SUBMIT_ANSWER_CONTEXT -> "submit_answer_context"
       ActivityContextCase.PLAY_VOICE_OVER_CONTEXT -> "play_voice_over_context"
+      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.EXIT_EXPLORATION_CONTEXT -> "exit_exploration_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 8d0ccb69a04..3008aa9bb76 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
@@ -42,6 +42,7 @@ class StandardEventTypeToHumanReadableNameConverterImpl @Inject constructor() :
       ActivityContextCase.ACCESS_SOLUTION_CONTEXT -> "reveal_solution"
       ActivityContextCase.SUBMIT_ANSWER_CONTEXT -> "submit_answer"
       ActivityContextCase.PLAY_VOICE_OVER_CONTEXT -> "click_play_voiceover_button"
+      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.EXIT_EXPLORATION_CONTEXT -> "leave_exploration"

From b58c7989bcf9761d1d4fd01b1d60211d09ec1163 Mon Sep 17 00:00:00 2001
From: Ben Henning <ben@oppia.org>
Date: Fri, 13 Jan 2023 14:32:48 -0800
Subject: [PATCH 06/38] Add mark chapter supported for admins.

With the learner study parameter enabled, admins can now force-complete
lessons on a per-profile basis for all profiles in the app. This
leverages the existing developer-only options menu so this isn't
something we would want to incorporate in the long-term without more
refinement (none of the UI strings are even translated).
---
 .../devoptions/DeveloperOptionsActivity.kt    |   9 +-
 .../markchapterscompleted/ChapterSelector.kt  |  13 --
 .../MarkChaptersCompletedActivity.kt          |  17 ++-
 .../MarkChaptersCompletedActivityPresenter.kt |   6 +-
 .../MarkChaptersCompletedFragment.kt          |  33 +++--
 .../MarkChaptersCompletedFragmentPresenter.kt | 124 +++++++++++++-----
 .../MarkChaptersCompletedTestActivity.kt      |   4 +-
 .../testing/DeveloperOptionsTestActivity.kt   |   5 +-
 .../settings/profile/ProfileEditActivity.kt   |   2 +-
 .../profile/ProfileEditFragmentPresenter.kt   |   9 ++
 .../settings/profile/ProfileEditViewModel.kt  |   7 +-
 .../main/res/layout/profile_edit_fragment.xml |  22 +++-
 app/src/main/res/values/strings.xml           |   1 +
 .../main/res/values/untranslated_strings.xml  |   4 +
 14 files changed, 172 insertions(+), 84 deletions(-)
 delete mode 100644 app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/ChapterSelector.kt

diff --git a/app/src/main/java/org/oppia/android/app/devoptions/DeveloperOptionsActivity.kt b/app/src/main/java/org/oppia/android/app/devoptions/DeveloperOptionsActivity.kt
index 2d6b82eb17b..bf8f287edb7 100644
--- a/app/src/main/java/org/oppia/android/app/devoptions/DeveloperOptionsActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/devoptions/DeveloperOptionsActivity.kt
@@ -47,8 +47,9 @@ class DeveloperOptionsActivity :
 
   override fun routeToMarkChaptersCompleted() {
     startActivity(
-      MarkChaptersCompletedActivity
-        .createMarkChaptersCompletedIntent(this, internalProfileId)
+      MarkChaptersCompletedActivity.createMarkChaptersCompletedIntent(
+        context = this, internalProfileId, showConfirmationNotice = false
+      )
     )
   }
 
@@ -86,10 +87,6 @@ class DeveloperOptionsActivity :
         decorateWithScreenName(DEVELOPER_OPTIONS_ACTIVITY)
       }
     }
-
-    fun getIntentKey(): String {
-      return NAVIGATION_PROFILE_ID_ARGUMENT_KEY
-    }
   }
 
   override fun forceCrash() {
diff --git a/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/ChapterSelector.kt b/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/ChapterSelector.kt
deleted file mode 100644
index b5214304acb..00000000000
--- a/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/ChapterSelector.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.oppia.android.app.devoptions.markchapterscompleted
-
-/** Interface to update the selectedChapterList in [MarkChaptersCompletedFragmentPresenter]. */
-interface ChapterSelector {
-  /** This chapter will get added to selectedTopicList in [MarkChaptersCompletedFragmentPresenter]. */
-  fun chapterSelected(chapterIndex: Int, nextStoryIndex: Int, explorationId: String)
-
-  /**
-   * Chapters from 'chapterIndex' until 'nextStoryIndex' will get removed from selectedTopicList in
-   * [MarkChaptersCompletedFragmentPresenter].
-   */
-  fun chapterUnselected(chapterIndex: Int, nextStoryIndex: Int)
-}
diff --git a/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedActivity.kt b/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedActivity.kt
index 27997cc5bb0..fcfc194cc96 100644
--- a/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedActivity.kt
@@ -21,13 +21,13 @@ class MarkChaptersCompletedActivity : InjectableAppCompatActivity() {
   @Inject
   lateinit var resourceHandler: AppLanguageResourceHandler
 
-  private var internalProfileId = -1
-
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     (activityComponent as ActivityComponentImpl).inject(this)
-    internalProfileId = intent.getIntExtra(PROFILE_ID_EXTRA_KEY, -1)
-    markChaptersCompletedActivityPresenter.handleOnCreate(internalProfileId)
+    val internalProfileId = intent.getIntExtra(PROFILE_ID_EXTRA_KEY, /* defaultValue= */ -1)
+    val showConfirmationNotice =
+      intent.getBooleanExtra(SHOW_CONFIRMATION_NOTICE_EXTRA_KEY, /* defaultValue= */ false)
+    markChaptersCompletedActivityPresenter.handleOnCreate(internalProfileId, showConfirmationNotice)
     title = resourceHandler.getStringInLocale(R.string.mark_chapters_completed_activity_title)
   }
 
@@ -39,11 +39,16 @@ class MarkChaptersCompletedActivity : InjectableAppCompatActivity() {
   }
 
   companion object {
-    const val PROFILE_ID_EXTRA_KEY = "MarkChaptersCompletedActivity.profile_id"
+    private const val PROFILE_ID_EXTRA_KEY = "MarkChaptersCompletedActivity.profile_id"
+    private const val SHOW_CONFIRMATION_NOTICE_EXTRA_KEY =
+      "MarkChaptersCompletedActivity.show_confirmation_notice"
 
-    fun createMarkChaptersCompletedIntent(context: Context, internalProfileId: Int): Intent {
+    fun createMarkChaptersCompletedIntent(
+      context: Context, internalProfileId: Int, showConfirmationNotice: Boolean
+    ): Intent {
       return Intent(context, MarkChaptersCompletedActivity::class.java).apply {
         putExtra(PROFILE_ID_EXTRA_KEY, internalProfileId)
+        putExtra(SHOW_CONFIRMATION_NOTICE_EXTRA_KEY, showConfirmationNotice)
         decorateWithScreenName(MARK_CHAPTERS_COMPLETED_ACTIVITY)
       }
     }
diff --git a/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedActivityPresenter.kt
index a2714817cb2..6605456b86e 100644
--- a/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedActivityPresenter.kt
@@ -11,14 +11,14 @@ class MarkChaptersCompletedActivityPresenter @Inject constructor(
   private val activity: AppCompatActivity
 ) {
 
-  fun handleOnCreate(internalProfileId: Int) {
+  fun handleOnCreate(internalProfileId: Int, showConfirmationNotice: Boolean) {
     activity.supportActionBar?.setDisplayHomeAsUpEnabled(true)
     activity.supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_arrow_back_white_24dp)
     activity.setContentView(R.layout.mark_chapters_completed_activity)
 
     if (getMarkChaptersCompletedFragment() == null) {
-      val markChaptersCompletedFragment = MarkChaptersCompletedFragment
-        .newInstance(internalProfileId)
+      val markChaptersCompletedFragment =
+        MarkChaptersCompletedFragment.newInstance(internalProfileId, showConfirmationNotice)
       activity.supportFragmentManager.beginTransaction().add(
         R.id.mark_chapters_completed_container,
         markChaptersCompletedFragment
diff --git a/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedFragment.kt b/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedFragment.kt
index e36bfbdd844..18f0b3c12b4 100644
--- a/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedFragment.kt
+++ b/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedFragment.kt
@@ -15,17 +15,22 @@ class MarkChaptersCompletedFragment : InjectableFragment() {
   lateinit var markChaptersCompletedFragmentPresenter: MarkChaptersCompletedFragmentPresenter
 
   companion object {
-    internal const val PROFILE_ID_ARGUMENT_KEY =
-      "MarkChaptersCompletedFragment.profile_id"
-
+    private const val PROFILE_ID_ARGUMENT_KEY = "MarkChaptersCompletedFragment.profile_id"
+    private const val SHOW_CONFIRMATION_NOTICE_ARGUMENT_KEY =
+      "MarkChaptersCompletedFragment.show_confirmation_notice"
     private const val EXPLORATION_ID_LIST_ARGUMENT_KEY =
       "MarkChaptersCompletedFragment.exploration_id_list"
+    private const val EXPLORATION_TITLE_LIST_ARGUMENT_KEY =
+      "MarkChaptersCompletedFragment.exploration_title_list"
 
     /** Returns a new [MarkChaptersCompletedFragment]. */
-    fun newInstance(internalProfileId: Int): MarkChaptersCompletedFragment {
+    fun newInstance(
+      internalProfileId: Int, showConfirmationNotice: Boolean
+    ): MarkChaptersCompletedFragment {
       val markChaptersCompletedFragment = MarkChaptersCompletedFragment()
       val args = Bundle()
       args.putInt(PROFILE_ID_ARGUMENT_KEY, internalProfileId)
+      args.putBoolean(SHOW_CONFIRMATION_NOTICE_ARGUMENT_KEY, showConfirmationNotice)
       markChaptersCompletedFragment.arguments = args
       return markChaptersCompletedFragment
     }
@@ -43,18 +48,16 @@ class MarkChaptersCompletedFragment : InjectableFragment() {
   ): View? {
     val args =
       checkNotNull(arguments) { "Expected arguments to be passed to MarkChaptersCompletedFragment" }
-    val internalProfileId = args
-      .getInt(PROFILE_ID_ARGUMENT_KEY, -1)
-    var selectedExplorationIdList = ArrayList<String>()
-    if (savedInstanceState != null) {
-      selectedExplorationIdList =
-        savedInstanceState.getStringArrayList(EXPLORATION_ID_LIST_ARGUMENT_KEY)!!
-    }
+    val internalProfileId = args.getInt(PROFILE_ID_ARGUMENT_KEY, /* defaultValue= */ -1)
+    val showConfirmationNotice =
+      args.getBoolean(SHOW_CONFIRMATION_NOTICE_ARGUMENT_KEY, /* defaultValue= */ false)
     return markChaptersCompletedFragmentPresenter.handleCreateView(
       inflater,
       container,
       internalProfileId,
-      selectedExplorationIdList
+      showConfirmationNotice,
+      savedInstanceState?.getStringArrayList(EXPLORATION_ID_LIST_ARGUMENT_KEY) ?: listOf(),
+      savedInstanceState?.getStringArrayList(EXPLORATION_TITLE_LIST_ARGUMENT_KEY) ?: listOf()
     )
   }
 
@@ -62,7 +65,11 @@ class MarkChaptersCompletedFragment : InjectableFragment() {
     super.onSaveInstanceState(outState)
     outState.putStringArrayList(
       EXPLORATION_ID_LIST_ARGUMENT_KEY,
-      markChaptersCompletedFragmentPresenter.selectedExplorationIdList
+      markChaptersCompletedFragmentPresenter.serializableSelectedExplorationIds
+    )
+    outState.putStringArrayList(
+      EXPLORATION_TITLE_LIST_ARGUMENT_KEY,
+      markChaptersCompletedFragmentPresenter.serializableSelectedExplorationTitles
     )
   }
 }
diff --git a/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedFragmentPresenter.kt
index 6c6e46c8266..140f2f47b11 100644
--- a/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedFragmentPresenter.kt
@@ -3,6 +3,7 @@ package org.oppia.android.app.devoptions.markchapterscompleted
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -15,6 +16,8 @@ import org.oppia.android.databinding.MarkChaptersCompletedFragmentBinding
 import org.oppia.android.databinding.MarkChaptersCompletedStorySummaryViewBinding
 import org.oppia.android.domain.devoptions.ModifyLessonProgressController
 import javax.inject.Inject
+import org.oppia.android.R
+import org.oppia.android.app.translation.AppLanguageResourceHandler
 
 /** The presenter for [MarkChaptersCompletedFragment]. */
 @FragmentScope
@@ -23,19 +26,29 @@ class MarkChaptersCompletedFragmentPresenter @Inject constructor(
   private val fragment: Fragment,
   private val viewModel: MarkChaptersCompletedViewModel,
   private val modifyLessonProgressController: ModifyLessonProgressController,
-  private val multiTypeBuilderFactory: BindableAdapter.MultiTypeBuilder.Factory
-) : ChapterSelector {
+  private val multiTypeBuilderFactory: BindableAdapter.MultiTypeBuilder.Factory,
+  private val resourceHandler: AppLanguageResourceHandler
+) {
   private lateinit var binding: MarkChaptersCompletedFragmentBinding
   private lateinit var linearLayoutManager: LinearLayoutManager
   private lateinit var bindingAdapter: BindableAdapter<MarkChaptersCompletedItemViewModel>
-  lateinit var selectedExplorationIdList: ArrayList<String>
   private lateinit var profileId: ProfileId
+  private lateinit var alertDialog: AlertDialog
+  private val selectedExplorationIds = mutableListOf<String>()
+  private val selectedExplorationTitles = mutableListOf<String>()
+
+  val serializableSelectedExplorationIds: ArrayList<String>
+    get() = ArrayList(selectedExplorationIds)
+  val serializableSelectedExplorationTitles: ArrayList<String>
+    get() = ArrayList(selectedExplorationTitles)
 
   fun handleCreateView(
     inflater: LayoutInflater,
     container: ViewGroup?,
     internalProfileId: Int,
-    selectedExplorationIdList: ArrayList<String>
+    showConfirmationNotice: Boolean,
+    selectedExplorationIds: List<String>,
+    selectedExplorationTitles: List<String>
   ): View? {
     binding = MarkChaptersCompletedFragmentBinding.inflate(
       inflater,
@@ -52,7 +65,8 @@ class MarkChaptersCompletedFragmentPresenter @Inject constructor(
       this.viewModel = this@MarkChaptersCompletedFragmentPresenter.viewModel
     }
 
-    this.selectedExplorationIdList = selectedExplorationIdList
+    this.selectedExplorationIds += selectedExplorationIds
+    this.selectedExplorationTitles += selectedExplorationTitles
 
     profileId = ProfileId.newBuilder().setInternalId(internalProfileId).build()
     viewModel.setProfileId(profileId)
@@ -74,7 +88,8 @@ class MarkChaptersCompletedFragmentPresenter @Inject constructor(
               chapterSelected(
                 viewModel.chapterIndex,
                 viewModel.nextStoryIndex,
-                viewModel.chapterSummary.explorationId
+                viewModel.chapterSummary.explorationId,
+                viewModel.chapterTitle
               )
           }
         }
@@ -91,11 +106,9 @@ class MarkChaptersCompletedFragmentPresenter @Inject constructor(
     }
 
     binding.markChaptersCompletedMarkCompletedTextView.setOnClickListener {
-      modifyLessonProgressController.markMultipleChaptersCompleted(
-        profileId = profileId,
-        chapterMap = viewModel.getChapterMap().filterKeys { selectedExplorationIdList.contains(it) }
-      )
-      activity.finish()
+      if (showConfirmationNotice) {
+        showConfirmationDialog()
+      } else markChaptersAsCompleted()
     }
 
     return binding.root
@@ -140,21 +153,19 @@ class MarkChaptersCompletedFragmentPresenter @Inject constructor(
       binding.isChapterChecked = true
       binding.isChapterCheckboxEnabled = false
     } else {
-      binding.isChapterChecked =
-        selectedExplorationIdList.contains(model.chapterSummary.explorationId)
+      binding.isChapterChecked = model.chapterSummary.explorationId in selectedExplorationIds
 
       binding.isChapterCheckboxEnabled = !model.chapterSummary.hasMissingPrerequisiteChapter() ||
         model.chapterSummary.hasMissingPrerequisiteChapter() &&
-        selectedExplorationIdList.contains(
-          model.chapterSummary.missingPrerequisiteChapter.explorationId
-        )
+        model.chapterSummary.missingPrerequisiteChapter.explorationId in selectedExplorationIds
 
       binding.markChaptersCompletedChapterCheckBox.setOnCheckedChangeListener { _, isChecked ->
         if (isChecked) {
           chapterSelected(
             model.chapterIndex,
             model.nextStoryIndex,
-            model.chapterSummary.explorationId
+            model.chapterSummary.explorationId,
+            model.chapterTitle
           )
         } else {
           chapterUnselected(model.chapterIndex, model.nextStoryIndex)
@@ -163,39 +174,34 @@ class MarkChaptersCompletedFragmentPresenter @Inject constructor(
     }
   }
 
-  override fun chapterSelected(chapterIndex: Int, nextStoryIndex: Int, explorationId: String) {
-    if (!selectedExplorationIdList.contains(explorationId)) {
-      selectedExplorationIdList.add(explorationId)
+  private fun chapterSelected(chapterIdx: Int, nextStoryIdx: Int, expId: String, expTitle: String) {
+    if (expId !in selectedExplorationIds) {
+      selectedExplorationIds += expId
+      selectedExplorationTitles += expTitle
     }
-    if (selectedExplorationIdList.size ==
-      viewModel.getItemList().count {
-        it is ChapterSummaryViewModel && !it.checkIfChapterIsCompleted()
-      }
-    ) {
+    if (selectedExplorationIds.size == viewModel.getItemList().countIncompleteChapters()) {
       binding.isAllChecked = true
     }
     if (!binding.markChaptersCompletedRecyclerView.isComputingLayout &&
       binding.markChaptersCompletedRecyclerView.scrollState == RecyclerView.SCROLL_STATE_IDLE
     ) {
-      bindingAdapter.notifyItemChanged(chapterIndex)
-      if (chapterIndex + 1 < nextStoryIndex)
-        bindingAdapter.notifyItemChanged(chapterIndex + 1)
+      bindingAdapter.notifyItemChanged(chapterIdx)
+      if (chapterIdx + 1 < nextStoryIdx)
+        bindingAdapter.notifyItemChanged(chapterIdx + 1)
     }
   }
 
-  override fun chapterUnselected(chapterIndex: Int, nextStoryIndex: Int) {
+  private fun chapterUnselected(chapterIndex: Int, nextStoryIndex: Int) {
     for (index in chapterIndex until nextStoryIndex) {
       val explorationId =
         (viewModel.getItemList()[index] as ChapterSummaryViewModel).chapterSummary.explorationId
-      if (selectedExplorationIdList.contains(explorationId)) {
-        selectedExplorationIdList.remove(explorationId)
+      val expIndex = selectedExplorationIds.indexOf(explorationId)
+      if (expIndex != -1) {
+        selectedExplorationIds.removeAt(expIndex)
+        selectedExplorationTitles.removeAt(expIndex)
       }
     }
-    if (selectedExplorationIdList.size !=
-      viewModel.getItemList().count {
-        it is ChapterSummaryViewModel && !it.checkIfChapterIsCompleted()
-      }
-    ) {
+    if (selectedExplorationIds.size != viewModel.getItemList().countIncompleteChapters()) {
       binding.isAllChecked = false
     }
     if (!binding.markChaptersCompletedRecyclerView.isComputingLayout &&
@@ -208,8 +214,54 @@ class MarkChaptersCompletedFragmentPresenter @Inject constructor(
     }
   }
 
+  private fun showConfirmationDialog() {
+    alertDialog = AlertDialog.Builder(activity, R.style.OppiaAlertDialogTheme).apply {
+      setTitle(R.string.mark_chapters_completed_confirm_setting_dialog_title)
+      setMessage(
+        resourceHandler.getStringInLocaleWithWrapping(
+          R.string.mark_chapters_completed_confirm_setting_dialog_message,
+          selectedExplorationTitles.joinToReadableString()
+        )
+      )
+      setNegativeButton(
+        R.string.mark_chapters_completed_confirm_setting_dialog_cancel_button_text
+      ) { dialog, _ -> dialog.dismiss() }
+      setPositiveButton(
+        R.string.mark_chapters_completed_confirm_setting_dialog_confirm_button_text
+      ) { dialog, _ ->
+        dialog.dismiss()
+        markChaptersAsCompleted()
+      }
+    }.create().also {
+      it.setCanceledOnTouchOutside(true)
+      it.show()
+    }
+  }
+
+  private fun markChaptersAsCompleted() {
+    modifyLessonProgressController.markMultipleChaptersCompleted(
+      profileId = profileId,
+      chapterMap = viewModel.getChapterMap().filterKeys { it in selectedExplorationIds }
+    )
+    activity.finish()
+  }
+
   private enum class ViewType {
     VIEW_TYPE_STORY,
     VIEW_TYPE_CHAPTER
   }
+
+  private companion object {
+    private fun List<String>.joinToReadableString(): String {
+      return when (size) {
+        0 -> ""
+        1 -> single()
+        2 -> "${this[0]} and ${this[1]}"
+        else -> "${asSequence().take(size - 1).joinToString()}, and ${last()}"
+      }
+    }
+
+    private fun List<MarkChaptersCompletedItemViewModel>.countIncompleteChapters() =
+      filterIsInstance<ChapterSummaryViewModel>().count { !it.checkIfChapterIsCompleted() }
+  }
 }
diff --git a/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/testing/MarkChaptersCompletedTestActivity.kt b/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/testing/MarkChaptersCompletedTestActivity.kt
index 66bb84cb5e0..5b854a4c25d 100644
--- a/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/testing/MarkChaptersCompletedTestActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/testing/MarkChaptersCompletedTestActivity.kt
@@ -21,8 +21,8 @@ class MarkChaptersCompletedTestActivity : InjectableAppCompatActivity() {
     setContentView(R.layout.mark_chapters_completed_activity)
     internalProfileId = intent.getIntExtra(PROFILE_ID_EXTRA_KEY, -1)
     if (getMarkChaptersCompletedFragment() == null) {
-      val markChaptersCompletedFragment = MarkChaptersCompletedFragment
-        .newInstance(internalProfileId)
+      val markChaptersCompletedFragment =
+        MarkChaptersCompletedFragment.newInstance(internalProfileId, showConfirmationNotice = false)
       supportFragmentManager.beginTransaction().add(
         R.id.mark_chapters_completed_container,
         markChaptersCompletedFragment
diff --git a/app/src/main/java/org/oppia/android/app/devoptions/testing/DeveloperOptionsTestActivity.kt b/app/src/main/java/org/oppia/android/app/devoptions/testing/DeveloperOptionsTestActivity.kt
index 046bb5ee117..b9dae33e7d8 100644
--- a/app/src/main/java/org/oppia/android/app/devoptions/testing/DeveloperOptionsTestActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/devoptions/testing/DeveloperOptionsTestActivity.kt
@@ -50,8 +50,9 @@ class DeveloperOptionsTestActivity :
 
   override fun routeToMarkChaptersCompleted() {
     startActivity(
-      MarkChaptersCompletedActivity
-        .createMarkChaptersCompletedIntent(this, internalProfileId)
+      MarkChaptersCompletedActivity.createMarkChaptersCompletedIntent(
+        context = this, internalProfileId, showConfirmationNotice = false
+      )
     )
   }
 
diff --git a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditActivity.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditActivity.kt
index f53b355b630..9399596698b 100644
--- a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditActivity.kt
@@ -19,7 +19,7 @@ const val IS_MULTIPANE_EXTRA_KEY = "ProfileEditActivity.is_multipane"
 const val IS_PROFILE_DELETION_DIALOG_VISIBLE_KEY =
   "ProfileEditActivity.is_profile_deletion_dialog_visible"
 
-/** Activity [ProfileEditActivity] that allows user to edit a profile. */
+/** Activity that allows admins to edit a profile. */
 class ProfileEditActivity : InjectableAppCompatActivity() {
   @Inject
   lateinit var profileEditActivityPresenter: ProfileEditActivityPresenter
diff --git a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditFragmentPresenter.kt
index 914bf3bade4..47d4fb8443f 100644
--- a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditFragmentPresenter.kt
@@ -18,6 +18,7 @@ import org.oppia.android.domain.profile.ProfileManagementController
 import org.oppia.android.util.data.AsyncResult
 import org.oppia.android.util.data.DataProviders.Companion.toLiveData
 import javax.inject.Inject
+import org.oppia.android.app.devoptions.markchapterscompleted.MarkChaptersCompletedActivity
 
 /** Argument key for profile deletion dialog in [ProfileEditFragment]. */
 const val TAG_PROFILE_DELETION_DIALOG = "PROFILE_DELETION_DIALOG"
@@ -74,6 +75,14 @@ class ProfileEditFragmentPresenter @Inject constructor(
       )
     }
 
+    binding.profileMarkChaptersForCompletionButton?.setOnClickListener {
+      activity.startActivity(
+        MarkChaptersCompletedActivity.createMarkChaptersCompletedIntent(
+          activity, internalProfileId, showConfirmationNotice = true
+        )
+      )
+    }
+
     binding.profileDeleteButton.setOnClickListener {
       showDeletionDialog(internalProfileId)
     }
diff --git a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditViewModel.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditViewModel.kt
index c15aa25d21b..b096bb45961 100644
--- a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditViewModel.kt
@@ -14,13 +14,15 @@ import org.oppia.android.util.data.DataProviders.Companion.toLiveData
 import org.oppia.android.util.platformparameter.EnableDownloadsSupport
 import org.oppia.android.util.platformparameter.PlatformParameterValue
 import javax.inject.Inject
+import org.oppia.android.util.platformparameter.LearnerStudyAnalytics
 
 /** The ViewModel for [ProfileEditActivity]. */
 @FragmentScope
 class ProfileEditViewModel @Inject constructor(
   private val oppiaLogger: OppiaLogger,
   private val profileManagementController: ProfileManagementController,
-  @EnableDownloadsSupport private val enableDownloadsSupport: PlatformParameterValue<Boolean>
+  @EnableDownloadsSupport private val enableDownloadsSupport: PlatformParameterValue<Boolean>,
+  @LearnerStudyAnalytics private val enableLearnerStudySupport: PlatformParameterValue<Boolean>
 ) : ObservableViewModel() {
   private lateinit var profileId: ProfileId
 
@@ -29,6 +31,9 @@ class ProfileEditViewModel @Inject constructor(
   /** Download access enabled for the profile by the administrator. */
   val isAllowedDownloadAccess: LiveData<Boolean> = isAllowedDownloadAccessMutableLiveData
 
+  /** Whether the admin is allowed to mark chapters as finished. */
+  val isAllowedToMarkFinishedChapters: Boolean = enableLearnerStudySupport.value
+
   /** List of all the current profiles registered in the app [ProfileListFragment]. */
   val profile: LiveData<Profile> by lazy {
     Transformations.map(
diff --git a/app/src/main/res/layout/profile_edit_fragment.xml b/app/src/main/res/layout/profile_edit_fragment.xml
index b1e0f7fdc10..6a10daaf230 100644
--- a/app/src/main/res/layout/profile_edit_fragment.xml
+++ b/app/src/main/res/layout/profile_edit_fragment.xml
@@ -115,6 +115,26 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/profile_rename_button" />
 
+      <Button
+        android:id="@+id/profile_mark_chapters_for_completion_button"
+        style="?android:attr/borderlessButtonStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/general_item_background_border"
+        android:fontFamily="sans-serif"
+        android:gravity="start|center_vertical"
+        android:minHeight="48dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:text="@string/profile_edit_mark_chapter_completion"
+        android:textAllCaps="false"
+        android:textColor="@color/component_color_shared_primary_text_color"
+        android:textSize="16sp"
+        android:visibility="@{viewModel.isAllowedToMarkFinishedChapters ? View.VISIBLE : View.GONE}"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/profile_reset_button" />
+
       <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/profile_edit_allow_download_container"
         android:layout_width="match_parent"
@@ -125,7 +145,7 @@
         android:visibility="@{viewModel.showEditDownloadAccess ? View.VISIBLE : View.GONE}"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/profile_reset_button">
+        app:layout_constraintTop_toBottomOf="@id/profile_mark_chapters_for_completion_button">
 
         <TextView
           android:id="@+id/profile_edit_allow_download_heading"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c08f86fc988..0542602ad3d 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -355,6 +355,7 @@
   <string name="profile_last_used">Last used </string>
   <string name="profile_edit_rename">Rename</string>
   <string name="profile_edit_reset">Reset PIN</string>
+  <string name="profile_edit_mark_chapter_completion">Mark Chapters Completed</string>
   <string name="profile_edit_delete">Profile Deletion</string>
   <string name="profile_edit_delete_dialog_title">Permanently delete this profile?</string>
   <string name="profile_edit_delete_dialog_message">All progress will be deleted and cannot be recovered.</string>
diff --git a/app/src/main/res/values/untranslated_strings.xml b/app/src/main/res/values/untranslated_strings.xml
index 2b85caf2580..958d1e8d50f 100644
--- a/app/src/main/res/values/untranslated_strings.xml
+++ b/app/src/main/res/values/untranslated_strings.xml
@@ -23,6 +23,10 @@
   <string name="force_network_type_cellular_network" translatable="false">Cellular</string>
   <string name="force_network_type_no_network" translatable="false">No network</string>
   <string name="mark_chapters_completed_activity_title" translatable="false">Mark Chapters Completed</string>
+  <string name="mark_chapters_completed_confirm_setting_dialog_title" translatable="false">Confirm Chapter Completions</string>
+  <string name="mark_chapters_completed_confirm_setting_dialog_message" translatable="false">The following chapters will be marked as finished: %s. Note that this is irreversible and will erase any partial lesson progress.</string>
+  <string name="mark_chapters_completed_confirm_setting_dialog_cancel_button_text" translatable="false">Cancel</string>
+  <string name="mark_chapters_completed_confirm_setting_dialog_confirm_button_text" translatable="false">Confirm completions</string>
   <string name="mark_stories_completed_activity_title" translatable="false">Mark Stories Completed</string>
   <string name="mark_topics_completed_activity_title" translatable="false">Mark Topics Completed</string>
   <string name="force_network_type_activity_title" translatable="false">Force Network Type</string>

From a502725286b050956d316a4778a54b1506b1b06b Mon Sep 17 00:00:00 2001
From: Ben Henning <ben@oppia.org>
Date: Fri, 13 Jan 2023 17:31:32 -0800
Subject: [PATCH 07/38] Fix in-lesson language switching.

This also adds Swahili translations for test topic 0. Some style changes
including support for a secondary button type. Updated the in-lesson
language switcher to use this style & to be gated behind the learner
study platform parameter.

And, fixes hint & solution header expanding to be the whole header and
not the whole card.
---
 ...HintsAndSolutionDialogFragmentPresenter.kt |  12 +-
 .../app/player/state/StateViewModel.kt        |   6 +-
 ...nd.xml => secondary_button_background.xml} |   2 +-
 app/src/main/res/layout/state_fragment.xml    | 110 +++--
 app/src/main/res/values/component_colors.xml  |   4 +-
 app/src/main/res/values/styles.xml            |  12 +-
 domain/src/main/assets/13.json                |  60 +++
 domain/src/main/assets/13.textproto           |  72 ++++
 domain/src/main/assets/skills.json            |   4 +-
 domain/src/main/assets/skills.textproto       |   4 +-
 domain/src/main/assets/test_exp_id_2.json     | 330 +++++++++++++++
 .../src/main/assets/test_exp_id_2.textproto   | 398 ++++++++++++++++++
 domain/src/main/assets/test_exp_id_5.json     | 145 +++++++
 .../src/main/assets/test_exp_id_5.textproto   | 174 ++++++++
 domain/src/main/assets/test_topic_id_0_1.json |  24 +-
 .../main/assets/test_topic_id_0_1.textproto   |  32 +-
 16 files changed, 1327 insertions(+), 62 deletions(-)
 rename app/src/main/res/drawable/{start_over_button_background.xml => secondary_button_background.xml} (79%)

diff --git a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragmentPresenter.kt
index 536c3ce037a..a3a98d4740c 100644
--- a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragmentPresenter.kt
@@ -239,7 +239,11 @@ class HintsAndSolutionDialogFragmentPresenter @Inject constructor(
       }
     }
 
-    // TODO: removed root click listener--verify the UI still behaves correctly. Document in PR description.
+    binding.expandableHintHeader.setOnClickListener {
+      if (hintsViewModel.isHintRevealed.get()!!) {
+        expandOrCollapseItem(position)
+      }
+    }
     binding.expandHintListIcon.setOnClickListener {
       if (hintsViewModel.isHintRevealed.get()!!) {
         expandOrCollapseItem(position)
@@ -317,7 +321,11 @@ class HintsAndSolutionDialogFragmentPresenter @Inject constructor(
       }
     }
 
-    // TODO: Ditto here, removed root click listener so verify that it still works correctly.
+    binding.expandableSolutionHeader.setOnClickListener {
+      if (solutionViewModel.isSolutionRevealed.get()!!) {
+        expandOrCollapseItem(position)
+      }
+    }
     binding.expandSolutionListIcon.setOnClickListener {
       if (solutionViewModel.isSolutionRevealed.get()!!) {
         expandOrCollapseItem(position)
diff --git a/app/src/main/java/org/oppia/android/app/player/state/StateViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/StateViewModel.kt
index 4739914eb82..4cc67adedad 100644
--- a/app/src/main/java/org/oppia/android/app/player/state/StateViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/player/state/StateViewModel.kt
@@ -25,6 +25,8 @@ import org.oppia.android.util.data.AsyncResult
 import org.oppia.android.util.data.DataProviders.Companion.toLiveData
 import org.oppia.android.util.locale.OppiaLocale
 import javax.inject.Inject
+import org.oppia.android.util.platformparameter.LearnerStudyAnalytics
+import org.oppia.android.util.platformparameter.PlatformParameterValue
 
 /** [ViewModel] for state-fragment. */
 @FragmentScope
@@ -33,7 +35,8 @@ class StateViewModel @Inject constructor(
   private val translationController: TranslationController,
   private val machineLocale: OppiaLocale.MachineLocale,
   private val oppiaLogger: OppiaLogger,
-  private val fragment: Fragment
+  private val fragment: Fragment,
+  @LearnerStudyAnalytics private val learnerStudyAnalytics: PlatformParameterValue<Boolean>
 ) : ObservableViewModel() {
   val itemList: ObservableList<StateItemViewModel> = ObservableArrayList()
   val rightItemList: ObservableList<StateItemViewModel> = ObservableArrayList()
@@ -46,6 +49,7 @@ class StateViewModel @Inject constructor(
   val isHintBulbVisible = ObservableField(false)
   val isHintOpenedAndUnRevealed = ObservableField(false)
 
+  val hasSupportForSwitchingToSwahili: Boolean = learnerStudyAnalytics.value
   val hasSwahiliTranslations: LiveData<Boolean> by lazy {
     Transformations.map(
       explorationProgressController.getCurrentState().toLiveData(),
diff --git a/app/src/main/res/drawable/start_over_button_background.xml b/app/src/main/res/drawable/secondary_button_background.xml
similarity index 79%
rename from app/src/main/res/drawable/start_over_button_background.xml
rename to app/src/main/res/drawable/secondary_button_background.xml
index d620c9b5d40..68713c8fece 100644
--- a/app/src/main/res/drawable/start_over_button_background.xml
+++ b/app/src/main/res/drawable/secondary_button_background.xml
@@ -5,5 +5,5 @@
   <solid android:color="@color/component_color_shared_white_background_color" />
   <stroke
     android:width="2dp"
-    android:color="@color/component_color_start_over_button_stroke_color" />
+    android:color="@color/component_color_shared_secondary_button_background_color" />
 </shape>
diff --git a/app/src/main/res/layout/state_fragment.xml b/app/src/main/res/layout/state_fragment.xml
index 905706852e9..067ab650d9c 100755
--- a/app/src/main/res/layout/state_fragment.xml
+++ b/app/src/main/res/layout/state_fragment.xml
@@ -99,57 +99,85 @@
       android:layout_width="match_parent"
       android:layout_height="match_parent" />
 
-    <FrameLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:paddingTop="24dp"
       android:layout_gravity="bottom|start"
+      android:paddingTop="24dp"
+      android:layout_marginTop="24dp"
       android:clipChildren="false"
       android:clipToPadding="false">
-      <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/hints_and_solution_fragment_container"
+      <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/audio_component_background"
-        android:visibility="@{viewModel.isHintBulbVisible() ? View.VISIBLE : View.GONE}"
-        android:clipChildren="false">
-
-        <ImageView
-          android:id="@+id/hint_bulb"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_margin="8dp"
-          android:contentDescription="@{viewModel.isHintOpenedAndUnRevealed() ? @string/new_hint_available : @string/no_new_hint_available}"
-          app:srcCompat="@{viewModel.isHintOpenedAndUnRevealed() ? @drawable/ic_hint_bulb_filled_yellow_48dp : @drawable/ic_hint_bulb_white_48dp}"
-          app:layout_constraintTop_toTopOf="parent"
-          app:layout_constraintBottom_toBottomOf="parent"
-          app:layout_constraintStart_toStartOf="parent" />
-
-        <TextView
-          android:id="@+id/hint_bar_title"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/animable_hints_and_solution_fragment_container"
+        android:background="@color/component_color_shared_state_fragment_background_color"
+        android:visibility="@{(viewModel.hasSupportForSwitchingToSwahili &amp;&amp; viewModel.hasSwahiliTranslations) ? View.VISIBLE : View.GONE}">
+        <androidx.appcompat.widget.AppCompatButton
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
-          android:layout_marginStart="16dp"
-          android:text="@string/hints_toolbar_title"
-          android:textSize="24sp"
-          android:textColor="@color/color_def_white"
-          app:layout_constraintTop_toTopOf="parent"
-          app:layout_constraintBottom_toBottomOf="parent"
-          app:layout_constraintStart_toEndOf="@+id/hint_bulb" />
-
-        <ImageView
-          android:id="@+id/open_hint_dialog_arrow"
-          android:layout_width="wrap_content"
+          style="@style/SecondaryButton"
+          android:layout_margin="16dp"
+          android:minWidth="@dimen/clickable_item_min_height"
+          android:minHeight="@dimen/clickable_item_min_height"
+          android:text="@{viewModel.hasEnabledSwahiliTranslations ? @string/temporary_translate_to_english : @string/temporary_translate_to_swahili}"
+          android:onClick="@{(v) -> viewModel.toggleContentLanguage(viewModel.hasEnabledSwahiliTranslations)}" />
+      </FrameLayout>
+
+      <FrameLayout
+        android:id="@+id/animable_hints_and_solution_fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent">
+        <androidx.constraintlayout.widget.ConstraintLayout
+          android:id="@+id/hints_and_solution_fragment_container"
+          android:layout_width="match_parent"
           android:layout_height="wrap_content"
-          android:layout_margin="8dp"
-          android:contentDescription="@string/show_hints_and_solution"
-          app:srcCompat="@{viewModel.isHintOpenedAndUnRevealed() ? @drawable/ic_keyboard_arrow_down_white_48dp : @drawable/ic_keyboard_arrow_right_white_48}"
-          app:layout_constraintTop_toTopOf="parent"
-          app:layout_constraintBottom_toBottomOf="parent"
-          app:layout_constraintEnd_toEndOf="parent" />
-
-      </androidx.constraintlayout.widget.ConstraintLayout>
-    </FrameLayout>
+          android:background="@color/audio_component_background"
+          android:visibility="@{viewModel.isHintBulbVisible() ? View.VISIBLE : View.GONE}"
+          android:clipChildren="false">
+
+          <ImageView
+            android:id="@+id/hint_bulb"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp"
+            android:contentDescription="@{viewModel.isHintOpenedAndUnRevealed() ? @string/new_hint_available : @string/no_new_hint_available}"
+            app:srcCompat="@{viewModel.isHintOpenedAndUnRevealed() ? @drawable/ic_hint_bulb_filled_yellow_48dp : @drawable/ic_hint_bulb_white_48dp}"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
+          <TextView
+            android:id="@+id/hint_bar_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:text="@string/hints_toolbar_title"
+            android:textSize="24sp"
+            android:textColor="@color/color_def_white"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/hint_bulb" />
+
+          <ImageView
+            android:id="@+id/open_hint_dialog_arrow"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp"
+            android:contentDescription="@string/show_hints_and_solution"
+            app:srcCompat="@{viewModel.isHintOpenedAndUnRevealed() ? @drawable/ic_keyboard_arrow_down_white_48dp : @drawable/ic_keyboard_arrow_right_white_48}"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+      </FrameLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <FrameLayout
       android:layout_width="match_parent"
diff --git a/app/src/main/res/values/component_colors.xml b/app/src/main/res/values/component_colors.xml
index d7f283d7496..54fd646bfba 100644
--- a/app/src/main/res/values/component_colors.xml
+++ b/app/src/main/res/values/component_colors.xml
@@ -21,6 +21,7 @@
   <color name="component_color_shared_previous_responses_header_item_container_background_color">@color/color_palette_highlighted_text_color</color>
   <color name="component_color_shared_transparent_background_color">@color/color_palette_transparent_background_color</color>
   <color name="component_color_shared_white_background_color">@color/color_palette_shared_white_background_color</color>
+  <color name="component_color_shared_secondary_button_background_color">@color/color_palette_secondary_toolbar_color</color>
   <color name="component_color_shared_previous_responses_header_item_text_color">@color/color_palette_highlighted_text_color</color>
   <color name="component_color_shared_input_interaction_edit_text_color">@color/color_palette_highlighted_text_color</color>
   <color name="component_color_shared_input_error_color">@color/color_palette_input_error_color</color>
@@ -142,9 +143,6 @@
   <color name="component_color_resume_lesson_topic_thumbnail_background_color">@color/color_palette_topic_thumbnail_background_color</color>
   <color name="component_color_continue_button_border_color">@color/color_palette_button_border_color</color>
   <color name="component_color_continue_button_background_color">@color/color_palette_secondary_toolbar_color</color>
-  <color name="component_color_start_over_button_text_color">@color/color_palette_secondary_toolbar_color</color>
-  <color name="component_color_start_over_button_stroke_color">@color/color_palette_secondary_toolbar_color</color>
-  <color name="component_color_start_over_button_drawable_tint_color">@color/color_palette_secondary_toolbar_color</color>
   <!-- Exploration Activity -->
   <color name="component_color_exploration_activity_toolbar_color">@color/color_palette_secondary_toolbar_color</color>
   <color name="component_color_exploration_activity_background_color">@color/color_palette_exploration_background_color</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b83dea8179e..53db1fec96e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -410,21 +410,23 @@
     <item name="android:textColor">@color/component_color_shared_text_view_text_color</item>
   </style>
   <!-- Start Over Lesson Button -->
-  <style name="StartOverLessonButton" parent="TextAppearance.AppCompat.Widget.Button">
+  <style name="SecondaryButton" parent="TextAppearance.AppCompat.Widget.Button">
     <item name="android:layout_width">144dp</item>
     <item name="android:layout_height">wrap_content</item>
     <item name="android:paddingEnd">12dp</item>
     <item name="android:paddingStart">12dp</item>
     <item name="android:minWidth">144dp</item>
-    <item name="android:background">@drawable/start_over_button_background</item>
+    <item name="android:background">@drawable/secondary_button_background</item>
     <item name="android:fontFamily">sans-serif-medium</item>
-    <item name="drawableStartCompat">@drawable/ic_start_over_24dp</item>
     <item name="android:drawablePadding">4dp</item>
-    <item name="drawableTint">@color/component_color_start_over_button_drawable_tint_color</item>
+    <item name="drawableTint">@color/component_color_shared_secondary_button_background_color</item>
     <item name="android:textAllCaps">true</item>
-    <item name="android:textColor">@color/component_color_start_over_button_text_color</item>
+    <item name="android:textColor">@color/component_color_shared_secondary_button_background_color</item>
     <item name="android:textSize">14sp</item>
   </style>
+  <style name="StartOverLessonButton" parent="SecondaryButton">
+    <item name="drawableStartCompat">@drawable/ic_start_over_24dp</item>
+  </style>
   <!-- Continue Lesson Button -->
   <style name="ContinueLessonButton" parent="TextAppearance.AppCompat.Widget.Button">
     <item name="android:layout_width">144dp</item>
diff --git a/domain/src/main/assets/13.json b/domain/src/main/assets/13.json
index 0cb3c0e8700..4f698b63f8c 100644
--- a/domain/src/main/assets/13.json
+++ b/domain/src/main/assets/13.json
@@ -45,6 +45,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> هذه هي النهاية & nbsp؛ </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Huu ndio mwisho & nbsp; </p>"},
+                "needs_update": false
               }
             }
           }
@@ -349,6 +354,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> يتكون نظامنا الشمسي من تسعة كواكب تدور حول الشمس: الزئبق، فينوس، الأرض، المريخ، كوكب المشتري، زحل، أورانوس، نبتون، بلوتو. وهي تتراوح بين عمالقة الغاز الضخمة إلى كواكب الأقزم القزم الصغيرة. </p> <p> </p> <p> انقر على الكواكب أدناه لمعرفة المزيد عن كل واحد! </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Mfumo wetu wa jua una sayari tisa zinazozunguka Jua letu: Mercury, Venus, Dunia, Mars, Jupita, Saturn, Uranus, Neptune na Pluto. Zinatokana na makubwa makubwa ya gesi hadi sayari ndogo za mchanga. </p> <p> </p> <p> Bonyeza kwenye sayari hapa chini ili kujua zaidi juu ya kila moja!"},
+                "needs_update": false
               }
             },
             "feedback_2": {
@@ -361,6 +371,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> هذا هو فينوس، والكوكب الثاني من الشمس. إنه ألمع كوكب في النظام الشمسي، ويمكن أن ينظر إليه في بعض الأحيان خلال اليوم. على الرغم من أن الزئبق أقرب إلى الشمس من فينوس، فإن فينوس هو سخونة كوكب في النظام الشمسي، لأن جو سميكة ثاني أكسيد الكربون الفخاخ الحرارة على سطحه. </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Hii ni Venus, sayari ya pili kutoka jua. Ni sayari safi zaidi katika mfumo wa jua, na wakati mwingine inaweza kuonekana hata wakati wa mchana. Ingawa Mercury iko karibu na jua kuliko Venus, Venus ndio sayari ya moto zaidi katika mfumo wa jua, kwa sababu mazingira yake mazito ya kaboni dioksidi huvuta joto kwenye uso wake. </p>"},
+                "needs_update": false
               }
             },
             "feedback_3": {
@@ -373,6 +388,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> الأرض! كوكبنا الرئيسي هو الكوكب الثالث من الشمس. على الرغم من استمرار النظام الشمسي وبقية المساحة، فإن المكان الوحيد الذي نعرفه أن الحياة موجودة. في المسافة اليمنى فقط من الشمس لضمان درجة حرارة مريحة بالنسبة لنا موجودة فيها. </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Dunia! Sayari yetu ya nyumbani ni sayari ya tatu kutoka jua. Licha ya ukubwa wa mfumo wa jua na nafasi iliyobaki, ndio mahali pekee ambayo tunajua maisha yapo. Ni katika umbali sahihi kutoka jua ili kuhakikisha joto la starehe kwetu kuwapo. </p>"},
+                "needs_update": false
               }
             },
             "feedback_1": {
@@ -385,6 +405,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<!DOCTYPE html>\n<html lang="},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Hii ni Mercury, sayari ndogo ya chuma karibu na jua. Kwa kuwa iko karibu sana na jua, inachukua siku 88 tu kusafiri kwa mzunguko mmoja, kwa hivyo mwaka juu ya Mercury ungekuwa na siku 88 tu. </p>"},
+                "needs_update": false
               }
             },
             "feedback_6": {
@@ -397,6 +422,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<P> Saturn، الكوكب السادس من الشمس، هو معروف جيدا لحلقاتها الجميلة من الجليد والغبار المدار حولها. مثل كوكب المشتري، فهي عملاقة غازية، معظمها مصنوعة من طبقات الهيدروجين التي تحصل على كثافة تدريجية نحو جوهرها الصلب. </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Saturn, sayari ya sita kutoka jua, inajulikana sana kwa pete zake nzuri za barafu na vumbi linalozunguka. Kama Jupita, ni kubwa ya gesi, iliyotengenezwa zaidi ya tabaka za hidrojeni ambayo hupata hatua kwa hatua kuelekea msingi wake thabiti. </p>"},
+                "needs_update": false
               }
             },
             "feedback_7": {
@@ -409,6 +439,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> أورانوس هو الكوكب السابع من الشمس. كان أول كوكب يتم اكتشافه باستخدام التلسكوب ، لأنه عادة ما يكون خافتًا جدًا بحيث لا يمكن رؤيته بالعين المجردة. إنه أبرد كوكب ، ويتكون من طبقات من غاز الهيدروجين تحيط بنواة متجمدة من الصخور والجليد. </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Uranus ni sayari ya saba kutoka jua. Ilikuwa sayari ya kwanza ambayo iligunduliwa kwa kutumia darubini, kwani kawaida ni dhaifu sana kuonekana na jicho uchi. Ni sayari baridi zaidi, na imeundwa kutoka kwa tabaka za gesi ya hidrojeni inayofunika msingi wa mwamba na barafu. </p>"},
+                "needs_update": false
               }
             },
             "feedback_4": {
@@ -421,6 +456,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> المريخ هو الكوكب الرابع من الشمس. غالبا ما يطلق عليه \"الكوكب الأحمر\" بسبب لونه، وهو نتيجة كميات كبيرة من أكسيد الحديد على سطحها. يحتوي على جو رقيق من ثاني أكسيد الكربون والقبعات الجليدية في أي من الطرفين، ولديه اثنين من أقمار صغيرة على شكل غير منتظم يسمى فوبوس وديموس. </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Mars ni sayari ya nne kutoka jua. Mara nyingi huitwa \"sayari nyekundu\" kwa sababu ya rangi yake, ambayo ni matokeo ya idadi kubwa ya oksidi ya chuma kwenye uso wake. Inayo mazingira nyembamba ya kaboni dioksidi na kofia za barafu pande zote mbili, na ina mwezi mbili ndogo-zenye umbo linaloitwa Phobos na Deimos. </p>"},
+                "needs_update": false
               }
             },
             "feedback_5": {
@@ -433,6 +473,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<P> كوكب المشتري، الكوكب الخامس من الشمس، هو كوكب ضخم يبلغ من العمر 2.5 مرة من كل الكواكب الأخرى في نظامنا الشمسي مجتمعة. يتم تشكيلها في الغالب من الغازات السميكة حول جوهر صلب. ميزة واحدة مشهورة بها هي \"بقعة حمراء رائعة\"، وهي عاصفة كبيرة على سطحها الذي اندلعت لمدة 350 عاما على الأقل، وهو كبير بما يكفي لابتلاع ثلاثة أذرع بأكملها. </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Jupita, sayari ya tano kutoka Jua, ni sayari kubwa ambayo ni nzito mara 2.5 kuliko sayari zingine zote kwenye mfumo wetu wa jua pamoja. Imeundwa zaidi ya gesi nene karibu na msingi thabiti. Kipengele kimoja maarufu juu yake ni \"Spot Nyekundu\", ambayo ni dhoruba kubwa juu ya uso wake ambao umejaa kwa angalau miaka 350, na ni kubwa ya kutosha kumeza ulimwengu wote. </p>"},
+                "needs_update": false
               }
             },
             "default_outcome": {
@@ -445,6 +490,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> هذا لا يبدو وكأنه الاختيار الصحيح. مرة أخرى </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Hii haionekani kama chaguo sahihi.Te tena </p>"},
+                "needs_update": false
               }
             },
             "feedback_8": {
@@ -457,6 +507,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> نبتون هو الكوكب الثامن من الشمس. إنه \"عملاق ثلج\"، مثل أورانوس، بطبقة خارجية من الهيدروجين والهيليوم والميثان يغليف جوهر جليدي. يمتص الميثان في جوها الضوء الأحمر، مما يمنحه اللون الأزرق الجميل. تم توقع وجوده لأول مرة من حسابات الجاذبية، وتم اكتشافه فقط بواسطة التلسكوب في وقت لاحق. </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Neptune ni sayari ya nane kutoka jua. Ni \"barafu kubwa\", kama Uranus, na safu ya nje ya hidrojeni, heliamu, na methane kufunika msingi wa Icy. Methane katika anga yake inachukua taa nyekundu, ikiipa rangi nzuri ya bluu. Ilitabiriwa kwa mara ya kwanza kutoka kwa mahesabu ya mvuto, na iligunduliwa tu na darubini baadaye. </p>"},
+                "needs_update": false
               }
             },
             "feedback_9": {
@@ -469,6 +524,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<P> كان بلوتو يعتبر مرة واحدة الكوكب التاسع من الشمس، لكن تم إعادة تصنيفه الآن باعتباره \"كوكب قزم\". يتم تشكيله من الجليد والصخور، وهو أصغر من قمرنا. من المقرر أن يصل المركبة الفضائية الأولى إلى زيارة بلوتو في يوليو 2015. </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Pluto wakati mmoja ilizingatiwa sayari ya tisa kutoka jua, lakini sasa imebadilishwa tena kama \"sayari ndogo\". Imeundwa kutoka barafu na mwamba, na ni ndogo hata kuliko mwezi wetu. Spacecraft ya kwanza ya kutembelea Pluto ni kwa sababu ya kufikia Julai 2015. </p>"},
+                "needs_update": false
               }
             }
           }
diff --git a/domain/src/main/assets/13.textproto b/domain/src/main/assets/13.textproto
index 183cad964f3..0afd6a06b4b 100644
--- a/domain/src/main/assets/13.textproto
+++ b/domain/src/main/assets/13.textproto
@@ -27,6 +27,12 @@ states {
             html: "<p> \331\207\330\260\331\207 \331\207\331\212 \330\247\331\204\331\206\331\207\330\247\331\212\330\251 & nbsp\330\233 </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Huu ndio mwisho & nbsp; </p>"
+          }
+        }
       }
     }
     interaction {
@@ -120,6 +126,12 @@ states {
             html: "<p> \331\212\330\252\331\203\331\210\331\206 \331\206\330\270\330\247\331\205\331\206\330\247 \330\247\331\204\330\264\331\205\330\263\331\212 \331\205\331\206 \330\252\330\263\330\271\330\251 \331\203\331\210\330\247\331\203\330\250 \330\252\330\257\331\210\330\261 \330\255\331\210\331\204 \330\247\331\204\330\264\331\205\330\263: \330\247\331\204\330\262\330\246\330\250\331\202\330\214 \331\201\331\212\331\206\331\210\330\263\330\214 \330\247\331\204\330\243\330\261\330\266\330\214 \330\247\331\204\331\205\330\261\331\212\330\256\330\214 \331\203\331\210\331\203\330\250 \330\247\331\204\331\205\330\264\330\252\330\261\331\212\330\214 \330\262\330\255\331\204\330\214 \330\243\331\210\330\261\330\247\331\206\331\210\330\263\330\214 \331\206\330\250\330\252\331\210\331\206\330\214 \330\250\331\204\331\210\330\252\331\210. \331\210\331\207\331\212 \330\252\330\252\330\261\330\247\331\210\330\255 \330\250\331\212\331\206 \330\271\331\205\330\247\331\204\331\202\330\251 \330\247\331\204\330\272\330\247\330\262 \330\247\331\204\330\266\330\256\331\205\330\251 \330\245\331\204\331\211 \331\203\331\210\330\247\331\203\330\250 \330\247\331\204\330\243\331\202\330\262\331\205 \330\247\331\204\331\202\330\262\331\205 \330\247\331\204\330\265\330\272\331\212\330\261\330\251. </p> <p> </p> <p> \330\247\331\206\331\202\330\261 \330\271\331\204\331\211 \330\247\331\204\331\203\331\210\330\247\331\203\330\250 \330\243\330\257\331\206\330\247\331\207 \331\204\331\205\330\271\330\261\331\201\330\251 \330\247\331\204\331\205\330\262\331\212\330\257 \330\271\331\206 \331\203\331\204 \331\210\330\247\330\255\330\257! </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Mfumo wetu wa jua una sayari tisa zinazozunguka Jua letu: Mercury, Venus, Dunia, Mars, Jupita, Saturn, Uranus, Neptune na Pluto. Zinatokana na makubwa makubwa ya gesi hadi sayari ndogo za mchanga. </p> <p> </p> <p> Bonyeza kwenye sayari hapa chini ili kujua zaidi juu ya kila moja!"
+          }
+        }
       }
     }
     written_translations {
@@ -137,6 +149,12 @@ states {
             html: "<p> \331\207\330\260\330\247 \331\207\331\210 \331\201\331\212\331\206\331\210\330\263\330\214 \331\210\330\247\331\204\331\203\331\210\331\203\330\250 \330\247\331\204\330\253\330\247\331\206\331\212 \331\205\331\206 \330\247\331\204\330\264\331\205\330\263. \330\245\331\206\331\207 \330\243\331\204\331\205\330\271 \331\203\331\210\331\203\330\250 \331\201\331\212 \330\247\331\204\331\206\330\270\330\247\331\205 \330\247\331\204\330\264\331\205\330\263\331\212\330\214 \331\210\331\212\331\205\331\203\331\206 \330\243\331\206 \331\212\331\206\330\270\330\261 \330\245\331\204\331\212\331\207 \331\201\331\212 \330\250\330\271\330\266 \330\247\331\204\330\243\330\255\331\212\330\247\331\206 \330\256\331\204\330\247\331\204 \330\247\331\204\331\212\331\210\331\205. \330\271\331\204\331\211 \330\247\331\204\330\261\330\272\331\205 \331\205\331\206 \330\243\331\206 \330\247\331\204\330\262\330\246\330\250\331\202 \330\243\331\202\330\261\330\250 \330\245\331\204\331\211 \330\247\331\204\330\264\331\205\330\263 \331\205\331\206 \331\201\331\212\331\206\331\210\330\263\330\214 \331\201\330\245\331\206 \331\201\331\212\331\206\331\210\330\263 \331\207\331\210 \330\263\330\256\331\210\331\206\330\251 \331\203\331\210\331\203\330\250 \331\201\331\212 \330\247\331\204\331\206\330\270\330\247\331\205 \330\247\331\204\330\264\331\205\330\263\331\212\330\214 \331\204\330\243\331\206 \330\254\331\210 \330\263\331\205\331\212\331\203\330\251 \330\253\330\247\331\206\331\212 \330\243\331\203\330\263\331\212\330\257 \330\247\331\204\331\203\330\261\330\250\331\210\331\206 \330\247\331\204\331\201\330\256\330\247\330\256 \330\247\331\204\330\255\330\261\330\247\330\261\330\251 \330\271\331\204\331\211 \330\263\330\267\330\255\331\207. </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Hii ni Venus, sayari ya pili kutoka jua. Ni sayari safi zaidi katika mfumo wa jua, na wakati mwingine inaweza kuonekana hata wakati wa mchana. Ingawa Mercury iko karibu na jua kuliko Venus, Venus ndio sayari ya moto zaidi katika mfumo wa jua, kwa sababu mazingira yake mazito ya kaboni dioksidi huvuta joto kwenye uso wake. </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -154,6 +172,12 @@ states {
             html: "<p> \330\247\331\204\330\243\330\261\330\266! \331\203\331\210\331\203\330\250\331\206\330\247 \330\247\331\204\330\261\330\246\331\212\330\263\331\212 \331\207\331\210 \330\247\331\204\331\203\331\210\331\203\330\250 \330\247\331\204\330\253\330\247\331\204\330\253 \331\205\331\206 \330\247\331\204\330\264\331\205\330\263. \330\271\331\204\331\211 \330\247\331\204\330\261\330\272\331\205 \331\205\331\206 \330\247\330\263\330\252\331\205\330\261\330\247\330\261 \330\247\331\204\331\206\330\270\330\247\331\205 \330\247\331\204\330\264\331\205\330\263\331\212 \331\210\330\250\331\202\331\212\330\251 \330\247\331\204\331\205\330\263\330\247\330\255\330\251\330\214 \331\201\330\245\331\206 \330\247\331\204\331\205\331\203\330\247\331\206 \330\247\331\204\331\210\330\255\331\212\330\257 \330\247\331\204\330\260\331\212 \331\206\330\271\330\261\331\201\331\207 \330\243\331\206 \330\247\331\204\330\255\331\212\330\247\330\251 \331\205\331\210\330\254\331\210\330\257\330\251. \331\201\331\212 \330\247\331\204\331\205\330\263\330\247\331\201\330\251 \330\247\331\204\331\212\331\205\331\206\331\211 \331\201\331\202\330\267 \331\205\331\206 \330\247\331\204\330\264\331\205\330\263 \331\204\330\266\331\205\330\247\331\206 \330\257\330\261\330\254\330\251 \330\255\330\261\330\247\330\261\330\251 \331\205\330\261\331\212\330\255\330\251 \330\250\330\247\331\204\331\206\330\263\330\250\330\251 \331\204\331\206\330\247 \331\205\331\210\330\254\331\210\330\257\330\251 \331\201\331\212\331\207\330\247. </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Dunia! Sayari yetu ya nyumbani ni sayari ya tatu kutoka jua. Licha ya ukubwa wa mfumo wa jua na nafasi iliyobaki, ndio mahali pekee ambayo tunajua maisha yapo. Ni katika umbali sahihi kutoka jua ili kuhakikisha joto la starehe kwetu kuwapo. </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -171,6 +195,12 @@ states {
             html: "<!DOCTYPE html>\n<html lang="
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Hii ni Mercury, sayari ndogo ya chuma karibu na jua. Kwa kuwa iko karibu sana na jua, inachukua siku 88 tu kusafiri kwa mzunguko mmoja, kwa hivyo mwaka juu ya Mercury ungekuwa na siku 88 tu. </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -188,6 +218,12 @@ states {
             html: "<P> Saturn\330\214 \330\247\331\204\331\203\331\210\331\203\330\250 \330\247\331\204\330\263\330\247\330\257\330\263 \331\205\331\206 \330\247\331\204\330\264\331\205\330\263\330\214 \331\207\331\210 \331\205\330\271\330\261\331\210\331\201 \330\254\331\212\330\257\330\247 \331\204\330\255\331\204\331\202\330\247\330\252\331\207\330\247 \330\247\331\204\330\254\331\205\331\212\331\204\330\251 \331\205\331\206 \330\247\331\204\330\254\331\204\331\212\330\257 \331\210\330\247\331\204\330\272\330\250\330\247\330\261 \330\247\331\204\331\205\330\257\330\247\330\261 \330\255\331\210\331\204\331\207\330\247. \331\205\330\253\331\204 \331\203\331\210\331\203\330\250 \330\247\331\204\331\205\330\264\330\252\330\261\331\212\330\214 \331\201\331\207\331\212 \330\271\331\205\331\204\330\247\331\202\330\251 \330\272\330\247\330\262\331\212\330\251\330\214 \331\205\330\271\330\270\331\205\331\207\330\247 \331\205\330\265\331\206\331\210\330\271\330\251 \331\205\331\206 \330\267\330\250\331\202\330\247\330\252 \330\247\331\204\331\207\331\212\330\257\330\261\331\210\330\254\331\212\331\206 \330\247\331\204\330\252\331\212 \330\252\330\255\330\265\331\204 \330\271\331\204\331\211 \331\203\330\253\330\247\331\201\330\251 \330\252\330\257\330\261\331\212\330\254\331\212\330\251 \331\206\330\255\331\210 \330\254\331\210\331\207\330\261\331\207\330\247 \330\247\331\204\330\265\331\204\330\250. </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Saturn, sayari ya sita kutoka jua, inajulikana sana kwa pete zake nzuri za barafu na vumbi linalozunguka. Kama Jupita, ni kubwa ya gesi, iliyotengenezwa zaidi ya tabaka za hidrojeni ambayo hupata hatua kwa hatua kuelekea msingi wake thabiti. </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -205,6 +241,12 @@ states {
             html: "<p> \330\243\331\210\330\261\330\247\331\206\331\210\330\263 \331\207\331\210 \330\247\331\204\331\203\331\210\331\203\330\250 \330\247\331\204\330\263\330\247\330\250\330\271 \331\205\331\206 \330\247\331\204\330\264\331\205\330\263. \331\203\330\247\331\206 \330\243\331\210\331\204 \331\203\331\210\331\203\330\250 \331\212\330\252\331\205 \330\247\331\203\330\252\330\264\330\247\331\201\331\207 \330\250\330\247\330\263\330\252\330\256\330\257\330\247\331\205 \330\247\331\204\330\252\331\204\330\263\331\203\331\210\330\250 \330\214 \331\204\330\243\331\206\331\207 \330\271\330\247\330\257\330\251 \331\205\330\247 \331\212\331\203\331\210\331\206 \330\256\330\247\331\201\330\252\331\213\330\247 \330\254\330\257\331\213\330\247 \330\250\330\255\331\212\330\253 \331\204\330\247 \331\212\331\205\331\203\331\206 \330\261\330\244\331\212\330\252\331\207 \330\250\330\247\331\204\330\271\331\212\331\206 \330\247\331\204\331\205\330\254\330\261\330\257\330\251. \330\245\331\206\331\207 \330\243\330\250\330\261\330\257 \331\203\331\210\331\203\330\250 \330\214 \331\210\331\212\330\252\331\203\331\210\331\206 \331\205\331\206 \330\267\330\250\331\202\330\247\330\252 \331\205\331\206 \330\272\330\247\330\262 \330\247\331\204\331\207\331\212\330\257\330\261\331\210\330\254\331\212\331\206 \330\252\330\255\331\212\330\267 \330\250\331\206\331\210\330\247\330\251 \331\205\330\252\330\254\331\205\330\257\330\251 \331\205\331\206 \330\247\331\204\330\265\330\256\331\210\330\261 \331\210\330\247\331\204\330\254\331\204\331\212\330\257. </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Uranus ni sayari ya saba kutoka jua. Ilikuwa sayari ya kwanza ambayo iligunduliwa kwa kutumia darubini, kwani kawaida ni dhaifu sana kuonekana na jicho uchi. Ni sayari baridi zaidi, na imeundwa kutoka kwa tabaka za gesi ya hidrojeni inayofunika msingi wa mwamba na barafu. </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -222,6 +264,12 @@ states {
             html: "<p> \330\247\331\204\331\205\330\261\331\212\330\256 \331\207\331\210 \330\247\331\204\331\203\331\210\331\203\330\250 \330\247\331\204\330\261\330\247\330\250\330\271 \331\205\331\206 \330\247\331\204\330\264\331\205\330\263. \330\272\330\247\331\204\330\250\330\247 \331\205\330\247 \331\212\330\267\331\204\331\202 \330\271\331\204\331\212\331\207 \"\330\247\331\204\331\203\331\210\331\203\330\250 \330\247\331\204\330\243\330\255\331\205\330\261\" \330\250\330\263\330\250\330\250 \331\204\331\210\331\206\331\207\330\214 \331\210\331\207\331\210 \331\206\330\252\331\212\330\254\330\251 \331\203\331\205\331\212\330\247\330\252 \331\203\330\250\331\212\330\261\330\251 \331\205\331\206 \330\243\331\203\330\263\331\212\330\257 \330\247\331\204\330\255\330\257\331\212\330\257 \330\271\331\204\331\211 \330\263\330\267\330\255\331\207\330\247. \331\212\330\255\330\252\331\210\331\212 \330\271\331\204\331\211 \330\254\331\210 \330\261\331\202\331\212\331\202 \331\205\331\206 \330\253\330\247\331\206\331\212 \330\243\331\203\330\263\331\212\330\257 \330\247\331\204\331\203\330\261\330\250\331\210\331\206 \331\210\330\247\331\204\331\202\330\250\330\271\330\247\330\252 \330\247\331\204\330\254\331\204\331\212\330\257\331\212\330\251 \331\201\331\212 \330\243\331\212 \331\205\331\206 \330\247\331\204\330\267\330\261\331\201\331\212\331\206\330\214 \331\210\331\204\330\257\331\212\331\207 \330\247\330\253\331\206\331\212\331\206 \331\205\331\206 \330\243\331\202\331\205\330\247\330\261 \330\265\330\272\331\212\330\261\330\251 \330\271\331\204\331\211 \330\264\331\203\331\204 \330\272\331\212\330\261 \331\205\331\206\330\252\330\270\331\205 \331\212\330\263\331\205\331\211 \331\201\331\210\330\250\331\210\330\263 \331\210\330\257\331\212\331\205\331\210\330\263. </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Mars ni sayari ya nne kutoka jua. Mara nyingi huitwa \"sayari nyekundu\" kwa sababu ya rangi yake, ambayo ni matokeo ya idadi kubwa ya oksidi ya chuma kwenye uso wake. Inayo mazingira nyembamba ya kaboni dioksidi na kofia za barafu pande zote mbili, na ina mwezi mbili ndogo-zenye umbo linaloitwa Phobos na Deimos. </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -239,6 +287,12 @@ states {
             html: "<P> \331\203\331\210\331\203\330\250 \330\247\331\204\331\205\330\264\330\252\330\261\331\212\330\214 \330\247\331\204\331\203\331\210\331\203\330\250 \330\247\331\204\330\256\330\247\331\205\330\263 \331\205\331\206 \330\247\331\204\330\264\331\205\330\263\330\214 \331\207\331\210 \331\203\331\210\331\203\330\250 \330\266\330\256\331\205 \331\212\330\250\331\204\330\272 \331\205\331\206 \330\247\331\204\330\271\331\205\330\261 2.5 \331\205\330\261\330\251 \331\205\331\206 \331\203\331\204 \330\247\331\204\331\203\331\210\330\247\331\203\330\250 \330\247\331\204\330\243\330\256\330\261\331\211 \331\201\331\212 \331\206\330\270\330\247\331\205\331\206\330\247 \330\247\331\204\330\264\331\205\330\263\331\212 \331\205\330\254\330\252\331\205\330\271\330\251. \331\212\330\252\331\205 \330\252\330\264\331\203\331\212\331\204\331\207\330\247 \331\201\331\212 \330\247\331\204\330\272\330\247\331\204\330\250 \331\205\331\206 \330\247\331\204\330\272\330\247\330\262\330\247\330\252 \330\247\331\204\330\263\331\205\331\212\331\203\330\251 \330\255\331\210\331\204 \330\254\331\210\331\207\330\261 \330\265\331\204\330\250. \331\205\331\212\330\262\330\251 \331\210\330\247\330\255\330\257\330\251 \331\205\330\264\331\207\331\210\330\261\330\251 \330\250\331\207\330\247 \331\207\331\212 \"\330\250\331\202\330\271\330\251 \330\255\331\205\330\261\330\247\330\241 \330\261\330\247\330\246\330\271\330\251\"\330\214 \331\210\331\207\331\212 \330\271\330\247\330\265\331\201\330\251 \331\203\330\250\331\212\330\261\330\251 \330\271\331\204\331\211 \330\263\330\267\330\255\331\207\330\247 \330\247\331\204\330\260\331\212 \330\247\331\206\330\257\331\204\330\271\330\252 \331\204\331\205\330\257\330\251 350 \330\271\330\247\331\205\330\247 \330\271\331\204\331\211 \330\247\331\204\330\243\331\202\331\204\330\214 \331\210\331\207\331\210 \331\203\330\250\331\212\330\261 \330\250\331\205\330\247 \331\212\331\203\331\201\331\212 \331\204\330\247\330\250\330\252\331\204\330\247\330\271 \330\253\331\204\330\247\330\253\330\251 \330\243\330\260\330\261\330\271 \330\250\330\243\331\203\331\205\331\204\331\207\330\247. </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Jupita, sayari ya tano kutoka Jua, ni sayari kubwa ambayo ni nzito mara 2.5 kuliko sayari zingine zote kwenye mfumo wetu wa jua pamoja. Imeundwa zaidi ya gesi nene karibu na msingi thabiti. Kipengele kimoja maarufu juu yake ni \"Spot Nyekundu\", ambayo ni dhoruba kubwa juu ya uso wake ambao umejaa kwa angalau miaka 350, na ni kubwa ya kutosha kumeza ulimwengu wote. </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -256,6 +310,12 @@ states {
             html: "<p> \331\207\330\260\330\247 \331\204\330\247 \331\212\330\250\330\257\331\210 \331\210\331\203\330\243\331\206\331\207 \330\247\331\204\330\247\330\256\330\252\331\212\330\247\330\261 \330\247\331\204\330\265\330\255\331\212\330\255. \331\205\330\261\330\251 \330\243\330\256\330\261\331\211 </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Hii haionekani kama chaguo sahihi.Te tena </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -273,6 +333,12 @@ states {
             html: "<p> \331\206\330\250\330\252\331\210\331\206 \331\207\331\210 \330\247\331\204\331\203\331\210\331\203\330\250 \330\247\331\204\330\253\330\247\331\205\331\206 \331\205\331\206 \330\247\331\204\330\264\331\205\330\263. \330\245\331\206\331\207 \"\330\271\331\205\331\204\330\247\331\202 \330\253\331\204\330\254\"\330\214 \331\205\330\253\331\204 \330\243\331\210\330\261\330\247\331\206\331\210\330\263\330\214 \330\250\330\267\330\250\331\202\330\251 \330\256\330\247\330\261\330\254\331\212\330\251 \331\205\331\206 \330\247\331\204\331\207\331\212\330\257\330\261\331\210\330\254\331\212\331\206 \331\210\330\247\331\204\331\207\331\212\331\204\331\212\331\210\331\205 \331\210\330\247\331\204\331\205\331\212\330\253\330\247\331\206 \331\212\330\272\331\204\331\212\331\201 \330\254\331\210\331\207\330\261 \330\254\331\204\331\212\330\257\331\212. \331\212\331\205\330\252\330\265 \330\247\331\204\331\205\331\212\330\253\330\247\331\206 \331\201\331\212 \330\254\331\210\331\207\330\247 \330\247\331\204\330\266\331\210\330\241 \330\247\331\204\330\243\330\255\331\205\330\261\330\214 \331\205\331\205\330\247 \331\212\331\205\331\206\330\255\331\207 \330\247\331\204\331\204\331\210\331\206 \330\247\331\204\330\243\330\262\330\261\331\202 \330\247\331\204\330\254\331\205\331\212\331\204. \330\252\331\205 \330\252\331\210\331\202\330\271 \331\210\330\254\331\210\330\257\331\207 \331\204\330\243\331\210\331\204 \331\205\330\261\330\251 \331\205\331\206 \330\255\330\263\330\247\330\250\330\247\330\252 \330\247\331\204\330\254\330\247\330\260\330\250\331\212\330\251\330\214 \331\210\330\252\331\205 \330\247\331\203\330\252\330\264\330\247\331\201\331\207 \331\201\331\202\330\267 \330\250\331\210\330\247\330\263\330\267\330\251 \330\247\331\204\330\252\331\204\330\263\331\203\331\210\330\250 \331\201\331\212 \331\210\331\202\330\252 \331\204\330\247\330\255\331\202. </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Neptune ni sayari ya nane kutoka jua. Ni \"barafu kubwa\", kama Uranus, na safu ya nje ya hidrojeni, heliamu, na methane kufunika msingi wa Icy. Methane katika anga yake inachukua taa nyekundu, ikiipa rangi nzuri ya bluu. Ilitabiriwa kwa mara ya kwanza kutoka kwa mahesabu ya mvuto, na iligunduliwa tu na darubini baadaye. </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -290,6 +356,12 @@ states {
             html: "<P> \331\203\330\247\331\206 \330\250\331\204\331\210\330\252\331\210 \331\212\330\271\330\252\330\250\330\261 \331\205\330\261\330\251 \331\210\330\247\330\255\330\257\330\251 \330\247\331\204\331\203\331\210\331\203\330\250 \330\247\331\204\330\252\330\247\330\263\330\271 \331\205\331\206 \330\247\331\204\330\264\331\205\330\263\330\214 \331\204\331\203\331\206 \330\252\331\205 \330\245\330\271\330\247\330\257\330\251 \330\252\330\265\331\206\331\212\331\201\331\207 \330\247\331\204\330\242\331\206 \330\250\330\247\330\271\330\252\330\250\330\247\330\261\331\207 \"\331\203\331\210\331\203\330\250 \331\202\330\262\331\205\". \331\212\330\252\331\205 \330\252\330\264\331\203\331\212\331\204\331\207 \331\205\331\206 \330\247\331\204\330\254\331\204\331\212\330\257 \331\210\330\247\331\204\330\265\330\256\331\210\330\261\330\214 \331\210\331\207\331\210 \330\243\330\265\330\272\330\261 \331\205\331\206 \331\202\331\205\330\261\331\206\330\247. \331\205\331\206 \330\247\331\204\331\205\331\202\330\261\330\261 \330\243\331\206 \331\212\330\265\331\204 \330\247\331\204\331\205\330\261\331\203\330\250\330\251 \330\247\331\204\331\201\330\266\330\247\330\246\331\212\330\251 \330\247\331\204\330\243\331\210\331\204\331\211 \330\245\331\204\331\211 \330\262\331\212\330\247\330\261\330\251 \330\250\331\204\331\210\330\252\331\210 \331\201\331\212 \331\212\331\210\331\204\331\212\331\210 2015. </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Pluto wakati mmoja ilizingatiwa sayari ya tisa kutoka jua, lakini sasa imebadilishwa tena kama \"sayari ndogo\". Imeundwa kutoka barafu na mwamba, na ni ndogo hata kuliko mwezi wetu. Spacecraft ya kwanza ya kutembelea Pluto ni kwa sababu ya kufikia Julai 2015. </p>"
+          }
+        }
       }
     }
     interaction {
diff --git a/domain/src/main/assets/skills.json b/domain/src/main/assets/skills.json
index 871db18559a..0a3afaa5e1f 100644
--- a/domain/src/main/assets/skills.json
+++ b/domain/src/main/assets/skills.json
@@ -130,7 +130,7 @@
     "skill_contents": {
       "explanation": {
         "content_id": "explanation",
-        "html": "Explanation with <b>rich text</b>.<p>Click on this <oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;test_skill_id_0&amp;quot;\" text-with-value=\"&amp;quot;test_skill_id_0 concept card&amp;quot;\"></oppia-noninteractive-skillreview>.</p>"
+        "html": "Explanation with <b>rich text</b>."
       },
       "worked_examples": [{
         "question": {
@@ -522,4 +522,4 @@
       }
     }
   }]
-}
+}
\ No newline at end of file
diff --git a/domain/src/main/assets/skills.textproto b/domain/src/main/assets/skills.textproto
index 7bdd492fcd2..afef5957961 100644
--- a/domain/src/main/assets/skills.textproto
+++ b/domain/src/main/assets/skills.textproto
@@ -152,7 +152,7 @@ concept_cards {
   skill_id: "test_skill_id_1"
   skill_description: "Another important skill"
   explanation {
-    html: "Explanation with <b>rich text</b>.<p>Click on this <oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;test_skill_id_0&amp;quot;\" text-with-value=\"&amp;quot;test_skill_id_0 concept card&amp;quot;\"></oppia-noninteractive-skillreview>.</p>"
+    html: "Explanation with <b>rich text</b>."
     content_id: "explanation"
   }
   worked_example {
@@ -622,4 +622,4 @@ concept_cards {
     value {
     }
   }
-}
+}
\ No newline at end of file
diff --git a/domain/src/main/assets/test_exp_id_2.json b/domain/src/main/assets/test_exp_id_2.json
index b5bd8cc49c3..87a18743954 100644
--- a/domain/src/main/assets/test_exp_id_2.json
+++ b/domain/src/main/assets/test_exp_id_2.json
@@ -120,6 +120,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "يعتبر <p> الأصفر لونا أساسيا في طيف لون RYB، ولكن هذا لا يتوافق مع الضوء. حاول مرة أخرى! </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> 'Njano' inachukuliwa kuwa rangi ya msingi katika wigo wa rangi ya RYB, lakini hiyo haihusiani na mwanga. Jaribu tena! </p>"},
+                "needs_update": false
               }
             },
             "feedback_1": {
@@ -132,6 +137,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<b> صحيح! </b>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<b> Sahihi! </b>"},
+                "needs_update": false
               }
             },
             "content": {
@@ -144,6 +154,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> ما هي الألوان الأساسية للضوء؟ </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Je! Ni rangi gani za msingi za mwanga? </p>"},
+                "needs_update": false
               }
             },
             "default_outcome": {
@@ -156,6 +171,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> هذا ليس صحيحا تماما. حاول مرة أخرى. </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Hiyo sio sawa kabisa. Jaribu tena. </p>"},
+                "needs_update": false
               }
             },
             "ca_choices_0": {
@@ -168,6 +188,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> أحمر </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> nyekundu </p>"},
+                "needs_update": false
               }
             },
             "ca_choices_1": {
@@ -180,6 +205,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> الأصفر </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Njano </p>"},
+                "needs_update": false
               }
             },
             "ca_choices_2": {
@@ -192,6 +222,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> أخضر </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> kijani </p>"},
+                "needs_update": false
               }
             },
             "ca_choices_3": {
@@ -204,6 +239,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> الأزرق </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p>Bluu</p>"},
+                "needs_update": false
               }
             },
             "ca_choices_4": {
@@ -216,6 +256,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> البرتقال </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> machungwa </p>"},
+                "needs_update": false
               }
             },
             "ca_choices_5": {
@@ -228,6 +273,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> الأرجواني </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> zambarau </p>"},
+                "needs_update": false
               }
             }
           }
@@ -312,6 +362,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> صحيح! يمكن أن يدعم النسور الرحلة. </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Sahihi! Tai zinaweza kuendeleza ndege. </p>"},
+                "needs_update": false
               }
             },
             "content": {
@@ -324,6 +379,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> أي طائر يمكن أن يدعم الرحلة لفترات طويلة من الزمن؟ </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Ni ndege gani anayeweza kuendeleza ndege kwa muda mrefu? </p>"},
+                "needs_update": false
               }
             },
             "default_outcome": {
@@ -336,6 +396,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> حاول مرة أخرى. </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Jaribu tena. </p>"},
+                "needs_update": false
               }
             },
             "ca_choices_0": {
@@ -348,6 +413,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> penguin </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Penguin </p>"},
+                "needs_update": false
               }
             },
             "ca_choices_1": {
@@ -360,6 +430,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> الدجاج </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "Kuku </p>"},
+                "needs_update": false
               }
             },
             "ca_choices_2": {
@@ -372,6 +447,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> النسر </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p>Tai</p>"},
+                "needs_update": false
               }
             }
           }
@@ -483,6 +563,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> صحيح! </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Sahihi! </p>"},
+                "needs_update": false
               }
             },
             "hint_6": {
@@ -495,6 +580,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> تذكر أن نصفيين، عند إضافته معا، قم بإجراء واحدة كاملة. </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Kumbuka kuwa nusu mbili, zinapoongezwa pamoja, fanya moja. maandishi-na-thamani = \"& amp; quot; test_skill_id_1 kadi ya dhana & amp; quot;\">"},
+                "needs_update": false
               }
             },
             "solution": {
@@ -507,6 +597,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> نصف شيء يحتوي على جزء واحد في البسط لكل قسمين في المقام. </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Nusu ya kitu kina sehemu moja katika nambari kwa kila sehemu mbili kwenye dhehebu. ; \" maandishi-na-thamani = \"& amp; quot; test_skill_id_1 kadi ya dhana & amp; quot;\">"},
+                "needs_update": false
               }
             },
             "content": {
@@ -519,6 +614,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> ما الكسر يمثل نصف شيء ما؟ </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Ni sehemu gani inayowakilisha nusu ya kitu? </p>"},
+                "needs_update": false
               }
             },
             "default_outcome": {
@@ -531,6 +631,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> تلك الإجابة غير صحيحة. حاول مرة أخرى. </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Jibu hilo sio sahihi. Jaribu tena. </p>"},
+                "needs_update": false
               }
             },
             "ca_placeholder_0": {
@@ -543,6 +648,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "إدخال الكسر."},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "Ingiza sehemu."},
+                "needs_update": false
               }
             }
           }
@@ -598,6 +708,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> اختبار الاستكشاف مع التفاعلات. <oppia-nonirtive-link النص مع القيمة = \"& quot؛ oppia & quot؛\" عنوان URL مع القيمة = \"& quot؛ https: //oppia.github.io&quot؛\"> </oppia-noninteractive-link> </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> uchunguzi wa uchunguzi na mwingiliano. <Opdia-noninteractive-link maandishi-na-thamani = \"& quot; Oppia & quot;\" url-na-thamani = \"& quot; https: //oppia.github.io&quot;\">"},
+                "needs_update": false
               }
             },
             "default_outcome": {
@@ -610,6 +725,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "استمرار فصاعدا."},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "Kuendelea mbele."},
+                "needs_update": false
               }
             }
           }
@@ -735,6 +855,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "يمكن إعادة صياغة <p> 11 * 11 على أنها 11 * 10، ثم أضف 11 في النهاية. </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> 11 * 11 inaweza kutolewa tena kama 11 * 10, kisha ongeza 11 mwishoni. </p>"},
+                "needs_update": false
               }
             },
             "solution": {
@@ -747,6 +872,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> 11 مرات 11 هو 121. </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> mara 11 11 ni 121. </p>"},
+                "needs_update": false
               }
             },
             "feedback_2": {
@@ -759,6 +889,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> ليس تماما. انها في الواقع أكبر من ذلك. حاول مرة أخرى. </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Sio kabisa. Kwa kweli ni kubwa kuliko hiyo. Jaribu tena. </p>"},
+                "needs_update": false
               }
             },
             "feedback_3": {
@@ -771,6 +906,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> ليس تماما. انها أقل من ذلك. </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Sio kabisa. Ni chini ya hiyo. </p>"},
+                "needs_update": false
               }
             },
             "feedback_1": {
@@ -783,6 +923,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> صحيح! </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Sahihi! </p>"},
+                "needs_update": false
               }
             },
             "content": {
@@ -795,6 +940,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> ما هو 11 مرة 11؟ </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Ni nini mara 11? </p>"},
+                "needs_update": false
               }
             },
             "default_outcome": {
@@ -807,6 +957,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> حدث خطأ ما. الجواب هو 121 - حاول مرة أخرى. </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Kuna kitu kilienda vibaya. Jibu ni 121-Jaribu tena. </p>"},
+                "needs_update": false
               }
             }
           }
@@ -928,6 +1083,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> صحيح </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Sahihi </p>"},
+                "needs_update": false
               }
             },
             "feedback_3": {
@@ -940,6 +1100,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> صحيح </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Sahihi </p>"},
+                "needs_update": false
               }
             },
             "feedback_1": {
@@ -952,6 +1117,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> لا يبدو هذا غير صحيح </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Hapana hii haionekani kuwa sawa </p>"},
+                "needs_update": false
               }
             },
             "content": {
@@ -964,6 +1134,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> رقمين على التوالي 20٪ و 50٪ أكثر من رقم ثالث. نسبة الأرقامين هي: </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "Nambari mbili ni 20% na 50% zaidi ya idadi ya tatu. Uwiano wa nambari mbili ni: </p>"},
+                "needs_update": false
               }
             },
             "default_outcome": {
@@ -976,6 +1151,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> غير صحيح </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> sio sahihi </p>"},
+                "needs_update": false
               }
             },
             "ca_placeholder_0": {
@@ -988,6 +1168,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "أدخل بتنسيق X: Y"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "Ingiza katika umbizo la x:y"},
+                "needs_update": false
               }
             }
           }
@@ -1072,6 +1257,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> صحيح! </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Sahihi! </p>"},
+                "needs_update": false
               }
             },
             "content": {
@@ -1084,6 +1274,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> في أي لغة تعني Oppia \"التعلم\"؟ </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Je! Onpia inamaanisha 'kujifunza'? </p>"},
+                "needs_update": false
               }
             },
             "default_outcome": {
@@ -1096,6 +1291,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> ليس تماما. حاول مرة أخرى (أو ربما استخدم محرك بحث). </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Sio kabisa. Jaribu tena (au labda utumie injini ya utaftaji). </p>"},
+                "needs_update": false
               }
             },
             "ca_placeholder_0": {
@@ -1108,6 +1308,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "أدخل لغة"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "Ingiza lugha"},
+                "needs_update": false
               }
             },
             "43df2897-0a03-4d1f-b892-9e1d251af5c9": {
@@ -1120,6 +1325,11 @@
                 "data_format": "set_of_normalized_string",
                 "translation": {"translations" : ["الفنلندية"]},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "set_of_normalized_string",
+                "translation": {"translations" : ["Kifini"]},
+                "needs_update": false
               }
             }
           }
@@ -1210,6 +1420,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> صحيح! </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Sahihi! </p>"},
+                "needs_update": false
               }
             },
             "content": {
@@ -1222,6 +1437,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> ما هو اللون \"G\" في \"RGB\" تتوافق مع </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Je! 'G' katika 'RGB' inahusiana na rangi gani? </p>"},
+                "needs_update": false
               }
             },
             "default_outcome": {
@@ -1234,6 +1454,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> ليس تماما. حاول مرة أخرى. </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Sio kabisa. Jaribu tena. </p>"},
+                "needs_update": false
               }
             },
             "ca_choices_0": {
@@ -1246,6 +1471,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> <strong> أخضر </strong> </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> <strong> kijani </strong> </p>"},
+                "needs_update": false
               }
             },
             "ca_choices_1": {
@@ -1258,6 +1488,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> <strong> أحمر </strong> </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> <strong> nyekundu </strong> </p>"},
+                "needs_update": false
               }
             },
             "ca_choices_2": {
@@ -1270,6 +1505,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> <strong> الأزرق </strong> </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> <strong> bluu </strong> </p>"},
+                "needs_update": false
               }
             }
           }
@@ -1402,6 +1642,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> فرز ما يلي في ترتيب تنازلي. </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Panga yafuatayo kwa mpangilio wa kushuka. </p>"},
+                "needs_update": false
               }
             },
             "feedback_2": {
@@ -1414,6 +1659,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> يبدو أنك فعلت النظام الصعودي </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Inaonekana kama ulifanya agizo la kupaa </p>"},
+                "needs_update": false
               }
             },
             "feedback_3": {
@@ -1426,6 +1676,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> هذا لا يبدو صحيحا </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Hii haionekani kuwa sawa kwangu </p>"},
+                "needs_update": false
               }
             },
             "feedback_1": {
@@ -1438,6 +1693,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> هذا صحيح </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Hiyo ni sahihi </p>"},
+                "needs_update": false
               }
             },
             "default_outcome": {
@@ -1450,6 +1710,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> ليس تماما. حاول مرة أخرى. </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p>Sio kabisa. Jaribu tena.</p>"},
+                "needs_update": false
               }
             },
             "ca_choices_0": {
@@ -1462,6 +1727,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> 0.35 </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> 0.35 </p>"},
+                "needs_update": false
               }
             },
             "ca_choices_1": {
@@ -1474,6 +1744,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> 3/5 </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p>3/5</p>"},
+                "needs_update": false
               }
             },
             "ca_choices_2": {
@@ -1486,6 +1761,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> 0.5 </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> 0.5 </p>"},
+                "needs_update": false
               }
             },
             "ca_choices_3": {
@@ -1498,6 +1778,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> 0.46 </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> 0.46 </p>"},
+                "needs_update": false
               }
             }
           }
@@ -1610,6 +1895,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> فرز ما يلي في ترتيب تنازلي، وضع العناصر المتساوية في نفس الموضع. </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p>Panga zifuatazo kwa mpangilio wa kushuka, ukiweka vitu sawa katika nafasi sawa.</p>"},
+                "needs_update": false
               }
             },
             "feedback_2": {
@@ -1622,6 +1912,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> يبدو أنك فعلت ترتيبًا تصاعديًا </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p>Inaonekana kama ulifanya agizo la kupanda</p>"},
+                "needs_update": false
               }
             },
             "feedback_3": {},
@@ -1635,6 +1930,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> هذا صحيح </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Hiyo ni sahihi </p>"},
+                "needs_update": false
               }
             },
             "default_outcome": {
@@ -1647,6 +1947,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> ليس تماما. حاول مرة أخرى. </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p>Sio kabisa. Jaribu tena.</p>"},
+                "needs_update": false
               }
             },
             "ca_choices_0": {
@@ -1659,6 +1964,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> 3/5 </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> 3/5 </p>"},
+                "needs_update": false
               }
             },
             "ca_choices_1": {
@@ -1671,6 +1981,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> 0.6 </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> 0.6 </p>"},
+                "needs_update": false
               }
             },
             "ca_choices_2": {
@@ -1683,6 +1998,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> 0.35 </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> 0.35 </p>"},
+                "needs_update": false
               }
             },
             "ca_choices_3": {
@@ -1695,6 +2015,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> 0.46 </p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> 0.46 </p>"},
+                "needs_update": false
               }
             }
           }
@@ -1739,6 +2064,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "تهانينا، لقد انتهيت!"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "Hongera, umemaliza!"},
+                "needs_update": false
               }
             }
           }
diff --git a/domain/src/main/assets/test_exp_id_2.textproto b/domain/src/main/assets/test_exp_id_2.textproto
index 180ee426a4b..f063ac38089 100644
--- a/domain/src/main/assets/test_exp_id_2.textproto
+++ b/domain/src/main/assets/test_exp_id_2.textproto
@@ -42,6 +42,12 @@ states {
             html: "\331\212\330\271\330\252\330\250\330\261 <p> \330\247\331\204\330\243\330\265\331\201\330\261 \331\204\331\210\331\206\330\247 \330\243\330\263\330\247\330\263\331\212\330\247 \331\201\331\212 \330\267\331\212\331\201 \331\204\331\210\331\206 RYB\330\214 \331\210\331\204\331\203\331\206 \331\207\330\260\330\247 \331\204\330\247 \331\212\330\252\331\210\330\247\331\201\331\202 \331\205\330\271 \330\247\331\204\330\266\331\210\330\241. \330\255\330\247\331\210\331\204 \331\205\330\261\330\251 \330\243\330\256\330\261\331\211! </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> \'Njano\' inachukuliwa kuwa rangi ya msingi katika wigo wa rangi ya RYB, lakini hiyo haihusiani na mwanga. Jaribu tena! </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -59,6 +65,12 @@ states {
             html: "<b> \330\265\330\255\331\212\330\255! </b>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<b> Sahihi! </b>"
+          }
+        }
       }
     }
     written_translations {
@@ -76,6 +88,12 @@ states {
             html: "<p> \331\205\330\247 \331\207\331\212 \330\247\331\204\330\243\331\204\331\210\330\247\331\206 \330\247\331\204\330\243\330\263\330\247\330\263\331\212\330\251 \331\204\331\204\330\266\331\210\330\241\330\237 </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Je! Ni rangi gani za msingi za mwanga? </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -93,6 +111,12 @@ states {
             html: "<p> \331\207\330\260\330\247 \331\204\331\212\330\263 \330\265\330\255\331\212\330\255\330\247 \330\252\331\205\330\247\331\205\330\247. \330\255\330\247\331\210\331\204 \331\205\330\261\330\251 \330\243\330\256\330\261\331\211. </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Hiyo sio sawa kabisa. Jaribu tena. </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -110,6 +134,12 @@ states {
             html: "<p> \330\243\330\255\331\205\330\261 </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> nyekundu </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -127,6 +157,12 @@ states {
             html: "<p> \330\247\331\204\330\243\330\265\331\201\330\261 </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Njano </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -144,6 +180,12 @@ states {
             html: "<p> \330\243\330\256\330\266\330\261 </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> kijani </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -161,6 +203,12 @@ states {
             html: "<p> \330\247\331\204\330\243\330\262\330\261\331\202 </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p>Bluu</p>"
+          }
+        }
       }
     }
     written_translations {
@@ -178,6 +226,12 @@ states {
             html: "<p> \330\247\331\204\330\250\330\261\330\252\331\202\330\247\331\204 </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> machungwa </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -195,6 +249,12 @@ states {
             html: "<p> \330\247\331\204\330\243\330\261\330\254\331\210\330\247\331\206\331\212 </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> zambarau </p>"
+          }
+        }
       }
     }
     interaction {
@@ -366,6 +426,12 @@ states {
             html: "<p> \330\265\330\255\331\212\330\255! \331\212\331\205\331\203\331\206 \330\243\331\206 \331\212\330\257\330\271\331\205 \330\247\331\204\331\206\330\263\331\210\330\261 \330\247\331\204\330\261\330\255\331\204\330\251. </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Sahihi! Tai zinaweza kuendeleza ndege. </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -383,6 +449,12 @@ states {
             html: "<p> \330\243\331\212 \330\267\330\247\330\246\330\261 \331\212\331\205\331\203\331\206 \330\243\331\206 \331\212\330\257\330\271\331\205 \330\247\331\204\330\261\330\255\331\204\330\251 \331\204\331\201\330\252\330\261\330\247\330\252 \330\267\331\210\331\212\331\204\330\251 \331\205\331\206 \330\247\331\204\330\262\331\205\331\206\330\237 </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Ni ndege gani anayeweza kuendeleza ndege kwa muda mrefu? </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -400,6 +472,12 @@ states {
             html: "<p> \330\255\330\247\331\210\331\204 \331\205\330\261\330\251 \330\243\330\256\330\261\331\211. </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Jaribu tena. </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -417,6 +495,12 @@ states {
             html: "<p> penguin </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Penguin </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -434,6 +518,12 @@ states {
             html: "<p> \330\247\331\204\330\257\330\254\330\247\330\254 </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "Kuku </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -451,6 +541,12 @@ states {
             html: "<p> \330\247\331\204\331\206\330\263\330\261 </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p>Tai</p>"
+          }
+        }
       }
     }
     interaction {
@@ -564,6 +660,12 @@ states {
             html: "<p> \330\265\330\255\331\212\330\255! </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Sahihi! </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -581,6 +683,12 @@ states {
             html: "<p> \330\252\330\260\331\203\330\261 \330\243\331\206 \331\206\330\265\331\201\331\212\331\212\331\206\330\214 \330\271\331\206\330\257 \330\245\330\266\330\247\331\201\330\252\331\207 \331\205\330\271\330\247\330\214 \331\202\331\205 \330\250\330\245\330\254\330\261\330\247\330\241 \331\210\330\247\330\255\330\257\330\251 \331\203\330\247\331\205\331\204\330\251. </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Kumbuka kuwa nusu mbili, zinapoongezwa pamoja, fanya moja. maandishi-na-thamani = \"& amp; quot; test_skill_id_1 kadi ya dhana & amp; quot;\">"
+          }
+        }
       }
     }
     written_translations {
@@ -598,6 +706,12 @@ states {
             html: "<p> \331\206\330\265\331\201 \330\264\331\212\330\241 \331\212\330\255\330\252\331\210\331\212 \330\271\331\204\331\211 \330\254\330\262\330\241 \331\210\330\247\330\255\330\257 \331\201\331\212 \330\247\331\204\330\250\330\263\330\267 \331\204\331\203\331\204 \331\202\330\263\331\205\331\212\331\206 \331\201\331\212 \330\247\331\204\331\205\331\202\330\247\331\205. </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Nusu ya kitu kina sehemu moja katika nambari kwa kila sehemu mbili kwenye dhehebu. ; \" maandishi-na-thamani = \"& amp; quot; test_skill_id_1 kadi ya dhana & amp; quot;\">"
+          }
+        }
       }
     }
     written_translations {
@@ -615,6 +729,12 @@ states {
             html: "<p> \331\205\330\247 \330\247\331\204\331\203\330\263\330\261 \331\212\331\205\330\253\331\204 \331\206\330\265\331\201 \330\264\331\212\330\241 \331\205\330\247\330\237 </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Ni sehemu gani inayowakilisha nusu ya kitu? </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -632,6 +752,12 @@ states {
             html: "<p> \330\252\331\204\331\203 \330\247\331\204\330\245\330\254\330\247\330\250\330\251 \330\272\331\212\330\261 \330\265\330\255\331\212\330\255\330\251. \330\255\330\247\331\210\331\204 \331\205\330\261\330\251 \330\243\330\256\330\261\331\211. </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Jibu hilo sio sahihi. Jaribu tena. </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -649,6 +775,12 @@ states {
             html: "\330\245\330\257\330\256\330\247\331\204 \330\247\331\204\331\203\330\263\330\261."
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "Ingiza sehemu."
+          }
+        }
       }
     }
     interaction {
@@ -765,6 +897,12 @@ states {
             html: "<p> \330\247\330\256\330\252\330\250\330\247\330\261 \330\247\331\204\330\247\330\263\330\252\331\203\330\264\330\247\331\201 \331\205\330\271 \330\247\331\204\330\252\331\201\330\247\330\271\331\204\330\247\330\252. <oppia-nonirtive-link \330\247\331\204\331\206\330\265 \331\205\330\271 \330\247\331\204\331\202\331\212\331\205\330\251 = \"& quot\330\233 oppia & quot\330\233\" \330\271\331\206\331\210\330\247\331\206 URL \331\205\330\271 \330\247\331\204\331\202\331\212\331\205\330\251 = \"& quot\330\233 https: //oppia.github.io&quot\330\233\"> </oppia-noninteractive-link> </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> uchunguzi wa uchunguzi na mwingiliano. <Opdia-noninteractive-link maandishi-na-thamani = \"& quot; Oppia & quot;\" url-na-thamani = \"& quot; https: //oppia.github.io&quot;\">"
+          }
+        }
       }
     }
     written_translations {
@@ -782,6 +920,12 @@ states {
             html: "\330\247\330\263\330\252\331\205\330\261\330\247\330\261 \331\201\330\265\330\247\330\271\330\257\330\247."
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "Kuendelea mbele."
+          }
+        }
       }
     }
     interaction {
@@ -862,6 +1006,12 @@ states {
             html: "\331\212\331\205\331\203\331\206 \330\245\330\271\330\247\330\257\330\251 \330\265\331\212\330\247\330\272\330\251 <p> 11 * 11 \330\271\331\204\331\211 \330\243\331\206\331\207\330\247 11 * 10\330\214 \330\253\331\205 \330\243\330\266\331\201 11 \331\201\331\212 \330\247\331\204\331\206\331\207\330\247\331\212\330\251. </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> 11 * 11 inaweza kutolewa tena kama 11 * 10, kisha ongeza 11 mwishoni. </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -879,6 +1029,12 @@ states {
             html: "<p> 11 \331\205\330\261\330\247\330\252 11 \331\207\331\210 121. </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> mara 11 11 ni 121. </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -896,6 +1052,12 @@ states {
             html: "<p> \331\204\331\212\330\263 \330\252\331\205\330\247\331\205\330\247. \330\247\331\206\331\207\330\247 \331\201\331\212 \330\247\331\204\331\210\330\247\331\202\330\271 \330\243\331\203\330\250\330\261 \331\205\331\206 \330\260\331\204\331\203. \330\255\330\247\331\210\331\204 \331\205\330\261\330\251 \330\243\330\256\330\261\331\211. </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Sio kabisa. Kwa kweli ni kubwa kuliko hiyo. Jaribu tena. </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -913,6 +1075,12 @@ states {
             html: "<p> \331\204\331\212\330\263 \330\252\331\205\330\247\331\205\330\247. \330\247\331\206\331\207\330\247 \330\243\331\202\331\204 \331\205\331\206 \330\260\331\204\331\203. </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Sio kabisa. Ni chini ya hiyo. </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -930,6 +1098,12 @@ states {
             html: "<p> \330\265\330\255\331\212\330\255! </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Sahihi! </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -947,6 +1121,12 @@ states {
             html: "<p> \331\205\330\247 \331\207\331\210 11 \331\205\330\261\330\251 11\330\237 </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Ni nini mara 11? </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -964,6 +1144,12 @@ states {
             html: "<p> \330\255\330\257\330\253 \330\256\330\267\330\243 \331\205\330\247. \330\247\331\204\330\254\331\210\330\247\330\250 \331\207\331\210 121 - \330\255\330\247\331\210\331\204 \331\205\330\261\330\251 \330\243\330\256\330\261\331\211. </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Kuna kitu kilienda vibaya. Jibu ni 121-Jaribu tena. </p>"
+          }
+        }
       }
     }
     interaction {
@@ -1095,6 +1281,12 @@ states {
             html: "<p> \330\265\330\255\331\212\330\255 </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Sahihi </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -1112,6 +1304,12 @@ states {
             html: "<p> \330\265\330\255\331\212\330\255 </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Sahihi </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -1129,6 +1327,12 @@ states {
             html: "<p> \331\204\330\247 \331\212\330\250\330\257\331\210 \331\207\330\260\330\247 \330\272\331\212\330\261 \330\265\330\255\331\212\330\255 </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Hapana hii haionekani kuwa sawa </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -1146,6 +1350,12 @@ states {
             html: "<p> \330\261\331\202\331\205\331\212\331\206 \330\271\331\204\331\211 \330\247\331\204\330\252\331\210\330\247\331\204\331\212 20\331\252 \331\210 50\331\252 \330\243\331\203\330\253\330\261 \331\205\331\206 \330\261\331\202\331\205 \330\253\330\247\331\204\330\253. \331\206\330\263\330\250\330\251 \330\247\331\204\330\243\330\261\331\202\330\247\331\205\331\212\331\206 \331\207\331\212: </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "Nambari mbili ni 20% na 50% zaidi ya idadi ya tatu. Uwiano wa nambari mbili ni: </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -1163,6 +1373,12 @@ states {
             html: "<p> \330\272\331\212\330\261 \330\265\330\255\331\212\330\255 </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> sio sahihi </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -1180,6 +1396,12 @@ states {
             html: "\330\243\330\257\330\256\331\204 \330\250\330\252\331\206\330\263\331\212\331\202 X: Y"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "Ingiza katika umbizo la x:y"
+          }
+        }
       }
     }
     interaction {
@@ -1312,6 +1534,12 @@ states {
             html: "<p> \330\265\330\255\331\212\330\255! </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Sahihi! </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -1329,6 +1557,12 @@ states {
             html: "<p> \331\201\331\212 \330\243\331\212 \331\204\330\272\330\251 \330\252\330\271\331\206\331\212 Oppia \"\330\247\331\204\330\252\330\271\331\204\331\205\"\330\237 </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Je! Onpia inamaanisha \'kujifunza\'? </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -1346,6 +1580,12 @@ states {
             html: "<p> \331\204\331\212\330\263 \330\252\331\205\330\247\331\205\330\247. \330\255\330\247\331\210\331\204 \331\205\330\261\330\251 \330\243\330\256\330\261\331\211 (\330\243\331\210 \330\261\330\250\331\205\330\247 \330\247\330\263\330\252\330\256\330\257\331\205 \331\205\330\255\330\261\331\203 \330\250\330\255\330\253). </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Sio kabisa. Jaribu tena (au labda utumie injini ya utaftaji). </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -1363,6 +1603,12 @@ states {
             html: "\330\243\330\257\330\256\331\204 \331\204\330\272\330\251"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "Ingiza lugha"
+          }
+        }
       }
     }
     written_translations {
@@ -1384,6 +1630,14 @@ states {
             }
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html_list {
+              html: "Kifini"
+            }
+          }
+        }
       }
     }
     interaction {
@@ -1476,6 +1730,12 @@ states {
             html: "<p> \330\265\330\255\331\212\330\255! </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Sahihi! </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -1493,6 +1753,12 @@ states {
             html: "<p> \331\205\330\247 \331\207\331\210 \330\247\331\204\331\204\331\210\331\206 \"G\" \331\201\331\212 \"RGB\" \330\252\330\252\331\210\330\247\331\201\331\202 \331\205\330\271 </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Je! \'G\' katika \'RGB\' inahusiana na rangi gani? </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -1510,6 +1776,12 @@ states {
             html: "<p> \331\204\331\212\330\263 \330\252\331\205\330\247\331\205\330\247. \330\255\330\247\331\210\331\204 \331\205\330\261\330\251 \330\243\330\256\330\261\331\211. </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Sio kabisa. Jaribu tena. </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -1527,6 +1799,12 @@ states {
             html: "<p> <strong> \330\243\330\256\330\266\330\261 </strong> </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> <strong> kijani </strong> </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -1544,6 +1822,12 @@ states {
             html: "<p> <strong> \330\243\330\255\331\205\330\261 </strong> </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> <strong> nyekundu </strong> </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -1561,6 +1845,12 @@ states {
             html: "<p> <strong> \330\247\331\204\330\243\330\262\330\261\331\202 </strong> </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> <strong> bluu </strong> </p>"
+          }
+        }
       }
     }
     interaction {
@@ -1690,6 +1980,12 @@ states {
             html: "<p> \331\201\330\261\330\262 \331\205\330\247 \331\212\331\204\331\212 \331\201\331\212 \330\252\330\261\330\252\331\212\330\250 \330\252\331\206\330\247\330\262\331\204\331\212. </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Panga yafuatayo kwa mpangilio wa kushuka. </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -1707,6 +2003,12 @@ states {
             html: "<p> \331\212\330\250\330\257\331\210 \330\243\331\206\331\203 \331\201\330\271\331\204\330\252 \330\247\331\204\331\206\330\270\330\247\331\205 \330\247\331\204\330\265\330\271\331\210\330\257\331\212 </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Inaonekana kama ulifanya agizo la kupaa </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -1724,6 +2026,12 @@ states {
             html: "<p> \331\207\330\260\330\247 \331\204\330\247 \331\212\330\250\330\257\331\210 \330\265\330\255\331\212\330\255\330\247 </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Hii haionekani kuwa sawa kwangu </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -1741,6 +2049,12 @@ states {
             html: "<p> \331\207\330\260\330\247 \330\265\330\255\331\212\330\255 </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Hiyo ni sahihi </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -1758,6 +2072,12 @@ states {
             html: "<p> \331\204\331\212\330\263 \330\252\331\205\330\247\331\205\330\247. \330\255\330\247\331\210\331\204 \331\205\330\261\330\251 \330\243\330\256\330\261\331\211. </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p>Sio kabisa. Jaribu tena.</p>"
+          }
+        }
       }
     }
     written_translations {
@@ -1775,6 +2095,12 @@ states {
             html: "<p> 0.35 </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> 0.35 </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -1792,6 +2118,12 @@ states {
             html: "<p> 3/5 </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p>3/5</p>"
+          }
+        }
       }
     }
     written_translations {
@@ -1809,6 +2141,12 @@ states {
             html: "<p> 0.5 </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> 0.5 </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -1826,6 +2164,12 @@ states {
             html: "<p> 0.46 </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> 0.46 </p>"
+          }
+        }
       }
     }
     interaction {
@@ -2028,6 +2372,12 @@ states {
             html: "<p> \331\201\330\261\330\262 \331\205\330\247 \331\212\331\204\331\212 \331\201\331\212 \330\252\330\261\330\252\331\212\330\250 \330\252\331\206\330\247\330\262\331\204\331\212\330\214 \331\210\330\266\330\271 \330\247\331\204\330\271\331\206\330\247\330\265\330\261 \330\247\331\204\331\205\330\252\330\263\330\247\331\210\331\212\330\251 \331\201\331\212 \331\206\331\201\330\263 \330\247\331\204\331\205\331\210\330\266\330\271. </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p>Panga zifuatazo kwa mpangilio wa kushuka, ukiweka vitu sawa katika nafasi sawa.</p>"
+          }
+        }
       }
     }
     written_translations {
@@ -2045,6 +2395,12 @@ states {
             html: "<p> \331\212\330\250\330\257\331\210 \330\243\331\206\331\203 \331\201\330\271\331\204\330\252 \330\252\330\261\330\252\331\212\330\250\331\213\330\247 \330\252\330\265\330\247\330\271\330\257\331\212\331\213\330\247 </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p>Inaonekana kama ulifanya agizo la kupanda</p>"
+          }
+        }
       }
     }
     written_translations {
@@ -2067,6 +2423,12 @@ states {
             html: "<p> \331\207\330\260\330\247 \330\265\330\255\331\212\330\255 </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Hiyo ni sahihi </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -2084,6 +2446,12 @@ states {
             html: "<p> \331\204\331\212\330\263 \330\252\331\205\330\247\331\205\330\247. \330\255\330\247\331\210\331\204 \331\205\330\261\330\251 \330\243\330\256\330\261\331\211. </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p>Sio kabisa. Jaribu tena.</p>"
+          }
+        }
       }
     }
     written_translations {
@@ -2101,6 +2469,12 @@ states {
             html: "<p> 3/5 </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> 3/5 </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -2118,6 +2492,12 @@ states {
             html: "<p> 0.6 </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> 0.6 </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -2135,6 +2515,12 @@ states {
             html: "<p> 0.35 </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> 0.35 </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -2152,6 +2538,12 @@ states {
             html: "<p> 0.46 </p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> 0.46 </p>"
+          }
+        }
       }
     }
     interaction {
@@ -2304,6 +2696,12 @@ states {
             html: "\330\252\331\207\330\247\331\206\331\212\331\206\330\247\330\214 \331\204\331\202\330\257 \330\247\331\206\330\252\331\207\331\212\330\252!"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "Hongera, umemaliza!"
+          }
+        }
       }
     }
     interaction {
diff --git a/domain/src/main/assets/test_exp_id_5.json b/domain/src/main/assets/test_exp_id_5.json
index 93f94c1d3e4..79795a7c2b3 100644
--- a/domain/src/main/assets/test_exp_id_5.json
+++ b/domain/src/main/assets/test_exp_id_5.json
@@ -82,6 +82,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> صحيح! </ p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Sahihi! </p>"},
+                "needs_update": false
               }
             },
             "content": {
@@ -94,6 +99,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> ما هو التعبير الرقمي يمثل واحد زائد اثنين دون إعادة ترتيب المسموح به؟ ملاحظة: يتم التعامل مع الانقسامات ككسور لهذه الولاية. </ p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Je! Ni usemi gani wa nambari unawakilisha moja pamoja na mbili bila kupanga upya kuruhusiwa? Kumbuka: Mgawanyiko unachukuliwa kama sehemu za hali hii. </p>"},
+                "needs_update": false
               }
             },
             "default_outcome": {
@@ -106,6 +116,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> تلك الإجابة غير صحيحة. حاول مرة أخرى. </ p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Jibu hilo sio sahihi. Jaribu tena. </p>"},
+                "needs_update": false
               }
             },
             "ca_placeholder_0": {
@@ -118,6 +133,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "إدخال تعبير رقمي."},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "Ingiza usemi wa nambari."},
+                "needs_update": false
               }
             }
           }
@@ -189,6 +209,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> صحيح! </ p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Sahihi! </p>"},
+                "needs_update": false
               }
             },
             "content": {
@@ -201,6 +226,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> ما هو التعبير الرقمي يمثل واحد زائد اثنين؟ لاحظ أن إعادة ترتيب التوزيع والزملية مسموح بها. </ p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Je! Ni usemi gani wa nambari unawakilisha moja pamoja na mbili? Kumbuka kuwa kupanga upya na kuhusika kunaruhusiwa. </p>"},
+                "needs_update": false
               }
             },
             "default_outcome": {
@@ -213,6 +243,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> تلك الإجابة غير صحيحة. حاول مرة أخرى. </ p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Jibu hilo sio sahihi. Jaribu tena. </p>"},
+                "needs_update": false
               }
             }
           }
@@ -284,6 +319,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> صحيح! </ p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p>Sawa!</p>"},
+                "needs_update": false
               }
             },
             "content": {
@@ -296,6 +336,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> ما هو التعبير الرقمي يمثل واحد زائد اثنين؟ لاحظ أن أي تعبير معادل مسموح به. </ p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Je! Ni usemi gani wa nambari unawakilisha moja pamoja na mbili? Kumbuka kuwa usemi wowote sawa unaruhusiwa. </p>"},
+                "needs_update": false
               }
             },
             "default_outcome": {
@@ -308,6 +353,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> تلك الإجابة غير صحيحة. حاول مرة أخرى. </ p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Jibu hilo sio sahihi. Jaribu tena. </p>"},
+                "needs_update": false
               }
             }
           }
@@ -386,6 +436,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> صحيح! </ p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Sahihi! </p>"},
+                "needs_update": false
               }
             },
             "content": {
@@ -398,6 +453,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> ما هو التعبير الجبري يمثل نتاج (x + 1) (x-2)؟ ملاحظة: يتم التعامل مع الانقسامات ككسور لهذه الولاية. </ p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p>Je, usemi gani wa aljebra unawakilisha bidhaa ya (x+1)(x-2)? Kumbuka: mgawanyiko unachukuliwa kama sehemu za jimbo hili.</p>"},
+                "needs_update": false
               }
             },
             "default_outcome": {
@@ -410,6 +470,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> هذه الإجابة غير صحيحة. حاول مرة أخرى. </ p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Jibu hilo sio sahihi. Jaribu tena. </p>"},
+                "needs_update": false
               }
             }
           }
@@ -485,6 +550,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> صحيح! </ p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Sahihi! </p>"},
+                "needs_update": false
               }
             },
             "content": {
@@ -497,6 +567,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> ما هو التعبير الجبري يمثل نتاج (x + 1) (x-2)؟ لاحظ أن إعادة ترتيب التوزيع والزملية مسموح بها. </ p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Nini usemi wa algebraic unawakilisha bidhaa ya (x+1) (x-2)? Kumbuka kuwa kupanga upya na kuhusika kunaruhusiwa. </p>"},
+                "needs_update": false
               }
             },
             "default_outcome": {
@@ -509,6 +584,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> تلك الإجابة غير صحيحة. حاول مرة أخرى. </ p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p>Jibu hilo si sahihi. Jaribu tena.</p>"},
+                "needs_update": false
               }
             }
           }
@@ -584,6 +664,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> صحيح! </ p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Sahihi! </p>"},
+                "needs_update": false
               }
             },
             "content": {
@@ -596,6 +681,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> ما هو التعبير الجبري يمثل نتاج (x + 1) (x-2)؟ لاحظ أن أي تعبير معادل مسموح به. </ p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Nini usemi wa algebraic unawakilisha bidhaa ya (x+1) (x-2)? Kumbuka kuwa usemi wowote sawa unaruhusiwa. </p>"},
+                "needs_update": false
               }
             },
             "default_outcome": {
@@ -608,6 +698,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> تلك الإجابة غير صحيحة. حاول مرة أخرى. </ p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Jibu hilo sio sahihi. Jaribu tena. </p>"},
+                "needs_update": false
               }
             }
           }
@@ -686,6 +781,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> صحيح! </ p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Sahihi! </p>"},
+                "needs_update": false
               }
             },
             "content": {
@@ -698,6 +798,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> ما هي المعادلة الجبرية تمثل كمية اثنين من y و (x + 1) (x-2)؟ ملاحظة: يتم التعامل مع الانقسامات ككسور لهذه الولاية. </ p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Je! Equation ya algebraic inawakilisha idadi ya y mbili na (x+1) (x-2)? Kumbuka: Mgawanyiko unachukuliwa kama sehemu za hali hii. </p>"},
+                "needs_update": false
               }
             },
             "default_outcome": {
@@ -710,6 +815,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> تلك الإجابة غير صحيحة. حاول مرة أخرى. </ p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Jibu hilo sio sahihi. Jaribu tena. </p>"},
+                "needs_update": false
               }
             }
           }
@@ -785,6 +895,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> صحيح! </ p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Sahihi! </p>"},
+                "needs_update": false
               }
             },
             "content": {
@@ -797,6 +912,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> ما المعادلة الجبرية التي تمثل كمية اثنين y و (x + 1) (x-2)؟ لاحظ أنه يُسمح بإعادة الترتيب التبادلي والرابطي. </ p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Je! Equation ya algebraic inawakilisha idadi ya y mbili na (x+1) (x-2)? Kumbuka kuwa kupanga upya na kuhusika kunaruhusiwa. </p>"},
+                "needs_update": false
               }
             },
             "default_outcome": {
@@ -809,6 +929,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> تلك الإجابة غير صحيحة. حاول مرة أخرى. </ p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Jibu hilo sio sahihi. Jaribu tena. </p>"},
+                "needs_update": false
               }
             }
           }
@@ -884,6 +1009,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> صحيح! </ p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Sahihi! </p>"},
+                "needs_update": false
               }
             },
             "content": {
@@ -896,6 +1026,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> ما هي المعادلة الجبرية تمثل كمية اثنين من y و (x + 1) (x-2)؟ لاحظ أن أي تعبير معادل مسموح به، بما في ذلك إعادة ترتيب حول علامة التساوي. </ p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Je! Equation ya algebraic inawakilisha idadi ya y mbili na (x+1) (x-2)? Kumbuka kuwa usemi wowote unaofanana unaruhusiwa, pamoja na kupanga upya karibu na ishara sawa. </p>"},
+                "needs_update": false
               }
             },
             "default_outcome": {
@@ -908,6 +1043,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "<p> تلك الإجابة غير صحيحة. حاول مرة أخرى. </ p>"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Jibu hilo sio sahihi. Jaribu tena. </p>"},
+                "needs_update": false
               }
             }
           }
@@ -952,6 +1092,11 @@
                 "data_format": "html",
                 "translation": {"translation" : "تهانينا، لقد انتهيت!"},
                 "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "Hongera, umemaliza!"},
+                "needs_update": false
               }
             }
           }
diff --git a/domain/src/main/assets/test_exp_id_5.textproto b/domain/src/main/assets/test_exp_id_5.textproto
index 2904a4ea1cd..a6324e0e31f 100644
--- a/domain/src/main/assets/test_exp_id_5.textproto
+++ b/domain/src/main/assets/test_exp_id_5.textproto
@@ -37,6 +37,12 @@ states {
             html: "<p> \330\265\330\255\331\212\330\255! </ p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Sahihi! </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -54,6 +60,12 @@ states {
             html: "<p> \331\205\330\247 \331\207\331\210 \330\247\331\204\330\252\330\271\330\250\331\212\330\261 \330\247\331\204\330\261\331\202\331\205\331\212 \331\212\331\205\330\253\331\204 \331\210\330\247\330\255\330\257 \330\262\330\247\330\246\330\257 \330\247\330\253\331\206\331\212\331\206 \330\257\331\210\331\206 \330\245\330\271\330\247\330\257\330\251 \330\252\330\261\330\252\331\212\330\250 \330\247\331\204\331\205\330\263\331\205\331\210\330\255 \330\250\331\207\330\237 \331\205\331\204\330\247\330\255\330\270\330\251: \331\212\330\252\331\205 \330\247\331\204\330\252\330\271\330\247\331\205\331\204 \331\205\330\271 \330\247\331\204\330\247\331\206\331\202\330\263\330\247\331\205\330\247\330\252 \331\203\331\203\330\263\331\210\330\261 \331\204\331\207\330\260\331\207 \330\247\331\204\331\210\331\204\330\247\331\212\330\251. </ p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Je! Ni usemi gani wa nambari unawakilisha moja pamoja na mbili bila kupanga upya kuruhusiwa? Kumbuka: Mgawanyiko unachukuliwa kama sehemu za hali hii. </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -71,6 +83,12 @@ states {
             html: "<p> \330\252\331\204\331\203 \330\247\331\204\330\245\330\254\330\247\330\250\330\251 \330\272\331\212\330\261 \330\265\330\255\331\212\330\255\330\251. \330\255\330\247\331\210\331\204 \331\205\330\261\330\251 \330\243\330\256\330\261\331\211. </ p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Jibu hilo sio sahihi. Jaribu tena. </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -88,6 +106,12 @@ states {
             html: "\330\245\330\257\330\256\330\247\331\204 \330\252\330\271\330\250\331\212\330\261 \330\261\331\202\331\205\331\212."
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "Ingiza usemi wa nambari."
+          }
+        }
       }
     }
     interaction {
@@ -177,6 +201,12 @@ states {
             html: "<p> \330\265\330\255\331\212\330\255! </ p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Sahihi! </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -194,6 +224,12 @@ states {
             html: "<p> \331\205\330\247 \331\207\331\210 \330\247\331\204\330\252\330\271\330\250\331\212\330\261 \330\247\331\204\330\261\331\202\331\205\331\212 \331\212\331\205\330\253\331\204 \331\210\330\247\330\255\330\257 \330\262\330\247\330\246\330\257 \330\247\330\253\331\206\331\212\331\206\330\237 \331\204\330\247\330\255\330\270 \330\243\331\206 \330\245\330\271\330\247\330\257\330\251 \330\252\330\261\330\252\331\212\330\250 \330\247\331\204\330\252\331\210\330\262\331\212\330\271 \331\210\330\247\331\204\330\262\331\205\331\204\331\212\330\251 \331\205\330\263\331\205\331\210\330\255 \330\250\331\207\330\247. </ p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Je! Ni usemi gani wa nambari unawakilisha moja pamoja na mbili? Kumbuka kuwa kupanga upya na kuhusika kunaruhusiwa. </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -211,6 +247,12 @@ states {
             html: "<p> \330\252\331\204\331\203 \330\247\331\204\330\245\330\254\330\247\330\250\330\251 \330\272\331\212\330\261 \330\265\330\255\331\212\330\255\330\251. \330\255\330\247\331\210\331\204 \331\205\330\261\330\251 \330\243\330\256\330\261\331\211. </ p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Jibu hilo sio sahihi. Jaribu tena. </p>"
+          }
+        }
       }
     }
     interaction {
@@ -283,6 +325,12 @@ states {
             html: "<p> \330\265\330\255\331\212\330\255! </ p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p>Sawa!</p>"
+          }
+        }
       }
     }
     written_translations {
@@ -300,6 +348,12 @@ states {
             html: "<p> \331\205\330\247 \331\207\331\210 \330\247\331\204\330\252\330\271\330\250\331\212\330\261 \330\247\331\204\330\261\331\202\331\205\331\212 \331\212\331\205\330\253\331\204 \331\210\330\247\330\255\330\257 \330\262\330\247\330\246\330\257 \330\247\330\253\331\206\331\212\331\206\330\237 \331\204\330\247\330\255\330\270 \330\243\331\206 \330\243\331\212 \330\252\330\271\330\250\331\212\330\261 \331\205\330\271\330\247\330\257\331\204 \331\205\330\263\331\205\331\210\330\255 \330\250\331\207. </ p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Je! Ni usemi gani wa nambari unawakilisha moja pamoja na mbili? Kumbuka kuwa usemi wowote sawa unaruhusiwa. </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -317,6 +371,12 @@ states {
             html: "<p> \330\252\331\204\331\203 \330\247\331\204\330\245\330\254\330\247\330\250\330\251 \330\272\331\212\330\261 \330\265\330\255\331\212\330\255\330\251. \330\255\330\247\331\210\331\204 \331\205\330\261\330\251 \330\243\330\256\330\261\331\211. </ p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Jibu hilo sio sahihi. Jaribu tena. </p>"
+          }
+        }
       }
     }
     interaction {
@@ -389,6 +449,12 @@ states {
             html: "<p> \330\265\330\255\331\212\330\255! </ p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Sahihi! </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -406,6 +472,12 @@ states {
             html: "<p> \331\205\330\247 \331\207\331\210 \330\247\331\204\330\252\330\271\330\250\331\212\330\261 \330\247\331\204\330\254\330\250\330\261\331\212 \331\212\331\205\330\253\331\204 \331\206\330\252\330\247\330\254 (x + 1) (x-2)\330\237 \331\205\331\204\330\247\330\255\330\270\330\251: \331\212\330\252\331\205 \330\247\331\204\330\252\330\271\330\247\331\205\331\204 \331\205\330\271 \330\247\331\204\330\247\331\206\331\202\330\263\330\247\331\205\330\247\330\252 \331\203\331\203\330\263\331\210\330\261 \331\204\331\207\330\260\331\207 \330\247\331\204\331\210\331\204\330\247\331\212\330\251. </ p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p>Je, usemi gani wa aljebra unawakilisha bidhaa ya (x+1)(x-2)? Kumbuka: mgawanyiko unachukuliwa kama sehemu za jimbo hili.</p>"
+          }
+        }
       }
     }
     written_translations {
@@ -423,6 +495,12 @@ states {
             html: "<p> \331\207\330\260\331\207 \330\247\331\204\330\245\330\254\330\247\330\250\330\251 \330\272\331\212\330\261 \330\265\330\255\331\212\330\255\330\251. \330\255\330\247\331\210\331\204 \331\205\330\261\330\251 \330\243\330\256\330\261\331\211. </ p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Jibu hilo sio sahihi. Jaribu tena. </p>"
+          }
+        }
       }
     }
     interaction {
@@ -511,6 +589,12 @@ states {
             html: "<p> \330\265\330\255\331\212\330\255! </ p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Sahihi! </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -528,6 +612,12 @@ states {
             html: "<p> \331\205\330\247 \331\207\331\210 \330\247\331\204\330\252\330\271\330\250\331\212\330\261 \330\247\331\204\330\254\330\250\330\261\331\212 \331\212\331\205\330\253\331\204 \331\206\330\252\330\247\330\254 (x + 1) (x-2)\330\237 \331\204\330\247\330\255\330\270 \330\243\331\206 \330\245\330\271\330\247\330\257\330\251 \330\252\330\261\330\252\331\212\330\250 \330\247\331\204\330\252\331\210\330\262\331\212\330\271 \331\210\330\247\331\204\330\262\331\205\331\204\331\212\330\251 \331\205\330\263\331\205\331\210\330\255 \330\250\331\207\330\247. </ p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Nini usemi wa algebraic unawakilisha bidhaa ya (x+1) (x-2)? Kumbuka kuwa kupanga upya na kuhusika kunaruhusiwa. </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -545,6 +635,12 @@ states {
             html: "<p> \330\252\331\204\331\203 \330\247\331\204\330\245\330\254\330\247\330\250\330\251 \330\272\331\212\330\261 \330\265\330\255\331\212\330\255\330\251. \330\255\330\247\331\210\331\204 \331\205\330\261\330\251 \330\243\330\256\330\261\331\211. </ p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p>Jibu hilo si sahihi. Jaribu tena.</p>"
+          }
+        }
       }
     }
     interaction {
@@ -627,6 +723,12 @@ states {
             html: "<p> \330\265\330\255\331\212\330\255! </ p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Sahihi! </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -644,6 +746,12 @@ states {
             html: "<p> \331\205\330\247 \331\207\331\210 \330\247\331\204\330\252\330\271\330\250\331\212\330\261 \330\247\331\204\330\254\330\250\330\261\331\212 \331\212\331\205\330\253\331\204 \331\206\330\252\330\247\330\254 (x + 1) (x-2)\330\237 \331\204\330\247\330\255\330\270 \330\243\331\206 \330\243\331\212 \330\252\330\271\330\250\331\212\330\261 \331\205\330\271\330\247\330\257\331\204 \331\205\330\263\331\205\331\210\330\255 \330\250\331\207. </ p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Nini usemi wa algebraic unawakilisha bidhaa ya (x+1) (x-2)? Kumbuka kuwa usemi wowote sawa unaruhusiwa. </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -661,6 +769,12 @@ states {
             html: "<p> \330\252\331\204\331\203 \330\247\331\204\330\245\330\254\330\247\330\250\330\251 \330\272\331\212\330\261 \330\265\330\255\331\212\330\255\330\251. \330\255\330\247\331\210\331\204 \331\205\330\261\330\251 \330\243\330\256\330\261\331\211. </ p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Jibu hilo sio sahihi. Jaribu tena. </p>"
+          }
+        }
       }
     }
     interaction {
@@ -743,6 +857,12 @@ states {
             html: "<p> \330\265\330\255\331\212\330\255! </ p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Sahihi! </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -760,6 +880,12 @@ states {
             html: "<p> \331\205\330\247 \331\207\331\212 \330\247\331\204\331\205\330\271\330\247\330\257\331\204\330\251 \330\247\331\204\330\254\330\250\330\261\331\212\330\251 \330\252\331\205\330\253\331\204 \331\203\331\205\331\212\330\251 \330\247\330\253\331\206\331\212\331\206 \331\205\331\206 y \331\210 (x + 1) (x-2)\330\237 \331\205\331\204\330\247\330\255\330\270\330\251: \331\212\330\252\331\205 \330\247\331\204\330\252\330\271\330\247\331\205\331\204 \331\205\330\271 \330\247\331\204\330\247\331\206\331\202\330\263\330\247\331\205\330\247\330\252 \331\203\331\203\330\263\331\210\330\261 \331\204\331\207\330\260\331\207 \330\247\331\204\331\210\331\204\330\247\331\212\330\251. </ p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Je! Equation ya algebraic inawakilisha idadi ya y mbili na (x+1) (x-2)? Kumbuka: Mgawanyiko unachukuliwa kama sehemu za hali hii. </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -777,6 +903,12 @@ states {
             html: "<p> \330\252\331\204\331\203 \330\247\331\204\330\245\330\254\330\247\330\250\330\251 \330\272\331\212\330\261 \330\265\330\255\331\212\330\255\330\251. \330\255\330\247\331\210\331\204 \331\205\330\261\330\251 \330\243\330\256\330\261\331\211. </ p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Jibu hilo sio sahihi. Jaribu tena. </p>"
+          }
+        }
       }
     }
     interaction {
@@ -868,6 +1000,12 @@ states {
             html: "<p> \330\265\330\255\331\212\330\255! </ p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Sahihi! </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -885,6 +1023,12 @@ states {
             html: "<p> \331\205\330\247 \330\247\331\204\331\205\330\271\330\247\330\257\331\204\330\251 \330\247\331\204\330\254\330\250\330\261\331\212\330\251 \330\247\331\204\330\252\331\212 \330\252\331\205\330\253\331\204 \331\203\331\205\331\212\330\251 \330\247\330\253\331\206\331\212\331\206 y \331\210 (x + 1) (x-2)\330\237 \331\204\330\247\330\255\330\270 \330\243\331\206\331\207 \331\212\331\217\330\263\331\205\330\255 \330\250\330\245\330\271\330\247\330\257\330\251 \330\247\331\204\330\252\330\261\330\252\331\212\330\250 \330\247\331\204\330\252\330\250\330\247\330\257\331\204\331\212 \331\210\330\247\331\204\330\261\330\247\330\250\330\267\331\212. </ p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Je! Equation ya algebraic inawakilisha idadi ya y mbili na (x+1) (x-2)? Kumbuka kuwa kupanga upya na kuhusika kunaruhusiwa. </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -902,6 +1046,12 @@ states {
             html: "<p> \330\252\331\204\331\203 \330\247\331\204\330\245\330\254\330\247\330\250\330\251 \330\272\331\212\330\261 \330\265\330\255\331\212\330\255\330\251. \330\255\330\247\331\210\331\204 \331\205\330\261\330\251 \330\243\330\256\330\261\331\211. </ p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Jibu hilo sio sahihi. Jaribu tena. </p>"
+          }
+        }
       }
     }
     interaction {
@@ -987,6 +1137,12 @@ states {
             html: "<p> \330\265\330\255\331\212\330\255! </ p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Sahihi! </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -1004,6 +1160,12 @@ states {
             html: "<p> \331\205\330\247 \331\207\331\212 \330\247\331\204\331\205\330\271\330\247\330\257\331\204\330\251 \330\247\331\204\330\254\330\250\330\261\331\212\330\251 \330\252\331\205\330\253\331\204 \331\203\331\205\331\212\330\251 \330\247\330\253\331\206\331\212\331\206 \331\205\331\206 y \331\210 (x + 1) (x-2)\330\237 \331\204\330\247\330\255\330\270 \330\243\331\206 \330\243\331\212 \330\252\330\271\330\250\331\212\330\261 \331\205\330\271\330\247\330\257\331\204 \331\205\330\263\331\205\331\210\330\255 \330\250\331\207\330\214 \330\250\331\205\330\247 \331\201\331\212 \330\260\331\204\331\203 \330\245\330\271\330\247\330\257\330\251 \330\252\330\261\330\252\331\212\330\250 \330\255\331\210\331\204 \330\271\331\204\330\247\331\205\330\251 \330\247\331\204\330\252\330\263\330\247\331\210\331\212. </ p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Je! Equation ya algebraic inawakilisha idadi ya y mbili na (x+1) (x-2)? Kumbuka kuwa usemi wowote unaofanana unaruhusiwa, pamoja na kupanga upya karibu na ishara sawa. </p>"
+          }
+        }
       }
     }
     written_translations {
@@ -1021,6 +1183,12 @@ states {
             html: "<p> \330\252\331\204\331\203 \330\247\331\204\330\245\330\254\330\247\330\250\330\251 \330\272\331\212\330\261 \330\265\330\255\331\212\330\255\330\251. \330\255\330\247\331\210\331\204 \331\205\330\261\330\251 \330\243\330\256\330\261\331\211. </ p>"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Jibu hilo sio sahihi. Jaribu tena. </p>"
+          }
+        }
       }
     }
     interaction {
@@ -1096,6 +1264,12 @@ states {
             html: "\330\252\331\207\330\247\331\206\331\212\331\206\330\247\330\214 \331\204\331\202\330\257 \330\247\331\206\330\252\331\207\331\212\330\252!"
           }
         }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "Hongera, umemaliza!"
+          }
+        }
       }
     }
     interaction {
diff --git a/domain/src/main/assets/test_topic_id_0_1.json b/domain/src/main/assets/test_topic_id_0_1.json
index 10fb5a319d8..3fa76d35f07 100644
--- a/domain/src/main/assets/test_topic_id_0_1.json
+++ b/domain/src/main/assets/test_topic_id_0_1.json
@@ -1,6 +1,6 @@
 {
   "topic_id": "test_topic_id_0",
-  "topic_name": "First Test Topic",
+  "topic_name": "",
   "page_contents": {
     "subtitled_html": {
       "content_id": "content",
@@ -13,6 +13,23 @@
     },
     "written_translations": {
       "translations_mapping": {
+        "title": {
+          "pt": {
+            "data_format": "html",
+            "translation": {"translation" : "Teste subtópico"},
+            "needs_update": false
+          },
+          "ar": {
+            "data_format": "html",
+            "translation": {"translation" : "اختبار فرعي"},
+            "needs_update": false
+          },
+          "sw": {
+            "data_format": "html",
+            "translation": {"translation" : "Jaribio la subtopic"},
+            "needs_update": false
+          }
+        },
         "content": {
           "pt": {
             "data_format": "html",
@@ -23,6 +40,11 @@
             "data_format": "html",
             "translation": {"translation" : "<p> وصف subtopic هنا. </p> <p> هذا هو نموذج subtopic مع محتوى وهمية لا يرتبط بأي شيء على وجه الخصوص. لاحظ أن هذه فقرات متعددة محاكاة محتوى أكثر واقعية. <oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;test_skill_id_0&amp;quot;\" text-with-value=\"&amp;quot; نص مع القيمة test_skill_id_0 concept card&amp;quot;\"></oppia-noninteractive-skillreview>. </p> <p> <oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;test_skill_id_1&amp;quot;\" text-with-value=\"&amp;quot; نص مع القيمة test_skill_id_1 concept card&amp;quot;\"></oppia-noninteractive-skillreview></p>"},
             "needs_update": false
+          },
+          "sw": {
+            "data_format": "html",
+            "translation": {"translation" : "<p> Maelezo ya subtopic iko hapa. Kumbuka kuwa hii ni aya nyingi kuiga yaliyomo zaidi ya chini. <opdia-noninteractive-skillreview skill_id-na-thamani = \"& amp; quot; test_skill_id_0 & amp; quot;\" maandishi-na-thamani = \"& amp; quot; test_skill_id_0 kadi ya dhana & amp; quot;\" quot; test_skill_id_1 & amp; quot; \" maandishi-na-thamani = \"& amp; quot; test_skill_id_1 kadi ya dhana & amp; quot;\">"},
+            "needs_update": false
           }
         }
       }
diff --git a/domain/src/main/assets/test_topic_id_0_1.textproto b/domain/src/main/assets/test_topic_id_0_1.textproto
index 18a3892092e..0e4f27b8ac6 100644
--- a/domain/src/main/assets/test_topic_id_0_1.textproto
+++ b/domain/src/main/assets/test_topic_id_0_1.textproto
@@ -8,25 +8,49 @@ recorded_voiceover {
   }
 }
 written_translation {
-  key: "content"
+  key: "title"
   value {
     translation_mapping {
       key: "pt"
       value {
-        html: "<p> Descri\303\247\303\243o do subtopic est\303\241 aqui. </p> <p> Este \303\251 a amostra subt\303\263pico com conte\303\272do fict\303\255cio n\303\243o relacionado a qualquer coisa em particular. Observe que isso \303\251 v\303\241rios par\303\241grafos para simular conte\303\272do subt\303\263pico mais realista. <oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;test_skill_id_0&amp;quot;\" text-with-value=\"&amp;quot;skill_id_0 conceito cart\303\243o&amp;quot;\"></oppia-noninteractive-skillreview>. </p> <p> <oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;test_skill_id_1&amp;quot;\" text-with-value=\"&amp;quot;skill_id_1 cart\303\243o&amp;quot;\"></oppia-noninteractive-skillreview></p>"
+        html: "Teste subt\303\263pico"
       }
     }
     translation_mapping {
       key: "ar"
       value {
-        html: "<p> \331\210\330\265\331\201 subtopic \331\207\331\206\330\247. </p> <p> \331\207\330\260\330\247 \331\207\331\210 \331\206\331\205\331\210\330\260\330\254 subtopic \331\205\330\271 \331\205\330\255\330\252\331\210\331\211 \331\210\331\207\331\205\331\212\330\251 \331\204\330\247 \331\212\330\261\330\252\330\250\330\267 \330\250\330\243\331\212 \330\264\331\212\330\241 \330\271\331\204\331\211 \331\210\330\254\331\207 \330\247\331\204\330\256\330\265\331\210\330\265. \331\204\330\247\330\255\330\270 \330\243\331\206 \331\207\330\260\331\207 \331\201\331\202\330\261\330\247\330\252 \331\205\330\252\330\271\330\257\330\257\330\251 \331\205\330\255\330\247\331\203\330\247\330\251 \331\205\330\255\330\252\331\210\331\211 \330\243\331\203\330\253\330\261 \331\210\330\247\331\202\330\271\331\212\330\251. <oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;test_skill_id_0&amp;quot;\" text-with-value=\"&amp;quot; \331\206\330\265 \331\205\330\271 \330\247\331\204\331\202\331\212\331\205\330\251 test_skill_id_0 concept card&amp;quot;\"></oppia-noninteractive-skillreview>. </p> <p> <oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;test_skill_id_1&amp;quot;\" text-with-value=\"&amp;quot; \331\206\330\265 \331\205\330\271 \330\247\331\204\331\202\331\212\331\205\330\251 test_skill_id_1 concept card&amp;quot;\"></oppia-noninteractive-skillreview></p>"
+        html: "\330\247\330\256\330\252\330\250\330\247\330\261 \331\201\330\261\330\271\331\212"
+      }
+    }
+    translation_mapping {
+      key: "sw"
+      value {
+        html: "Jaribio la subtopic"
       }
     }
   }
 }
 written_translation {
-  key: "title"
+  key: "content"
   value {
+    translation_mapping {
+      key: "pt"
+      value {
+        html: "<p> Descri\303\247\303\243o do subtopic est\303\241 aqui. </p> <p> Este \303\251 a amostra subt\303\263pico com conte\303\272do fict\303\255cio n\303\243o relacionado a qualquer coisa em particular. Observe que isso \303\251 v\303\241rios par\303\241grafos para simular conte\303\272do subt\303\263pico mais realista. <oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;test_skill_id_0&amp;quot;\" text-with-value=\"&amp;quot;skill_id_0 conceito cart\303\243o&amp;quot;\"></oppia-noninteractive-skillreview>. </p> <p> <oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;test_skill_id_1&amp;quot;\" text-with-value=\"&amp;quot;skill_id_1 cart\303\243o&amp;quot;\"></oppia-noninteractive-skillreview></p>"
+      }
+    }
+    translation_mapping {
+      key: "ar"
+      value {
+        html: "<p> \331\210\330\265\331\201 subtopic \331\207\331\206\330\247. </p> <p> \331\207\330\260\330\247 \331\207\331\210 \331\206\331\205\331\210\330\260\330\254 subtopic \331\205\330\271 \331\205\330\255\330\252\331\210\331\211 \331\210\331\207\331\205\331\212\330\251 \331\204\330\247 \331\212\330\261\330\252\330\250\330\267 \330\250\330\243\331\212 \330\264\331\212\330\241 \330\271\331\204\331\211 \331\210\330\254\331\207 \330\247\331\204\330\256\330\265\331\210\330\265. \331\204\330\247\330\255\330\270 \330\243\331\206 \331\207\330\260\331\207 \331\201\331\202\330\261\330\247\330\252 \331\205\330\252\330\271\330\257\330\257\330\251 \331\205\330\255\330\247\331\203\330\247\330\251 \331\205\330\255\330\252\331\210\331\211 \330\243\331\203\330\253\330\261 \331\210\330\247\331\202\330\271\331\212\330\251. <oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;test_skill_id_0&amp;quot;\" text-with-value=\"&amp;quot; \331\206\330\265 \331\205\330\271 \330\247\331\204\331\202\331\212\331\205\330\251 test_skill_id_0 concept card&amp;quot;\"></oppia-noninteractive-skillreview>. </p> <p> <oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;test_skill_id_1&amp;quot;\" text-with-value=\"&amp;quot; \331\206\330\265 \331\205\330\271 \330\247\331\204\331\202\331\212\331\205\330\251 test_skill_id_1 concept card&amp;quot;\"></oppia-noninteractive-skillreview></p>"
+      }
+    }
+    translation_mapping {
+      key: "sw"
+      value {
+        html: "<p> Maelezo ya subtopic iko hapa. Kumbuka kuwa hii ni aya nyingi kuiga yaliyomo zaidi ya chini. <opdia-noninteractive-skillreview skill_id-na-thamani = \"& amp; quot; test_skill_id_0 & amp; quot;\" maandishi-na-thamani = \"& amp; quot; test_skill_id_0 kadi ya dhana & amp; quot;\" quot; test_skill_id_1 & amp; quot; \" maandishi-na-thamani = \"& amp; quot; test_skill_id_1 kadi ya dhana & amp; quot;\">"
+      }
+    }
   }
 }
 skill_ids: "test_skill_id_0"

From 50615ab07796d75e421c22c1b7f72366075a99ce Mon Sep 17 00:00:00 2001
From: Ben Henning <ben@oppia.org>
Date: Wed, 18 Jan 2023 15:34:13 -0800
Subject: [PATCH 08/38] Add support for multiple solution types.

This also includes a rebuild of much of the hint/solution data flow
since the previous version had a lot of unnecessary complexity. It also
redefines the internal representation for solution answers (which makes
them type-safe during data retrieval time).
---
 app/BUILD.bazel                               |   5 +-
 .../app/hintsandsolution/HintViewModel.kt     |  16 +
 ...HintsAndSolutionDialogFragmentPresenter.kt | 230 +++++---------
 .../HintsAndSolutionViewModel.kt              |  94 ++++++
 .../app/hintsandsolution/HintsViewModel.kt    | 122 --------
 .../ReturnToLessonViewModel.kt                |   2 +-
 .../app/hintsandsolution/SolutionViewModel.kt | 254 +++++++++++++--
 ...tionExplorationManagerFragmentPresenter.kt |   5 +-
 .../{hints_summary.xml => hint_summary.xml}   |   4 +-
 .../layout/hints_and_solution_fragment.xml    |   2 +-
 app/src/main/res/layout/solution_summary.xml  |  35 +--
 app/src/main/res/values/strings.xml           |   5 +-
 domain/src/main/assets/13.textproto           |  18 +-
 domain/src/main/assets/2mzzFVDLuAj8.json      |  78 +++--
 domain/src/main/assets/5NWuolNcwH6e.json      |  70 +++--
 domain/src/main/assets/5NWuolNcwH6e.textproto |   7 +-
 domain/src/main/assets/GJ2rLXRKD5hw_1.json    |   6 +-
 .../src/main/assets/GJ2rLXRKD5hw_1.textproto  |   6 +-
 domain/src/main/assets/GJ2rLXRKD5hw_2.json    |   6 +-
 .../src/main/assets/GJ2rLXRKD5hw_2.textproto  |   4 +-
 domain/src/main/assets/GJ2rLXRKD5hw_3.json    |   6 +-
 .../src/main/assets/GJ2rLXRKD5hw_3.textproto  |   4 +-
 domain/src/main/assets/GJ2rLXRKD5hw_4.json    |   6 +-
 .../src/main/assets/GJ2rLXRKD5hw_4.textproto  |   4 +-
 domain/src/main/assets/MjZzEVOG47_1.json      | 146 +++++----
 domain/src/main/assets/MjZzEVOG47_1.textproto | 100 +++---
 domain/src/main/assets/k2bQ7z5XHNbK.json      |  72 +++--
 domain/src/main/assets/omzF4oqgeTXd_1.json    |   6 +-
 .../src/main/assets/omzF4oqgeTXd_1.textproto  |   4 +-
 domain/src/main/assets/questions.json         |  98 +++---
 domain/src/main/assets/questions.textproto    |  55 ++--
 domain/src/main/assets/skills.json            |  57 +++-
 domain/src/main/assets/skills.textproto       |  68 ++++-
 domain/src/main/assets/tIoSb3HZFN6e.json      |  67 ++--
 domain/src/main/assets/tIoSb3HZFN6e.textproto |   7 +-
 ...t_checkpointing_base_exploration.textproto |   1 -
 ...tion_multiple_compatible_updates.textproto |   1 -
 ...ultiple_updates_one_incompatible.textproto |   1 -
 ...ckpointing_exploration_new_title.textproto |   1 -
 ...pointing_exploration_new_version.textproto |   1 -
 ...ted_first_state_compat_rule_spec.textproto |   1 -
 ...ed_first_state_correctness_label.textproto |   1 -
 ..._updated_first_state_destination.textproto |   1 -
 ...pdated_first_state_feedback_html.textproto |   1 -
 ..._updated_first_state_feedback_id.textproto |   1 -
 ...d_first_state_incompat_rule_spec.textproto |   1 -
 ..._updated_first_state_interaction.textproto |   3 +-
 ...d_first_state_new_correct_answer.textproto |   1 -
 ...pdated_first_state_updated_hints.textproto |   1 -
 ...ion_updated_second_state_removed.textproto |   1 -
 domain/src/main/assets/test_exp_id_2.json     | 122 +++++++-
 .../src/main/assets/test_exp_id_2.textproto   | 143 ++++++++-
 domain/src/main/assets/test_exp_id_4.json     |   6 +-
 domain/src/main/assets/test_exp_id_5.json     | 252 ++++++++++++++-
 .../src/main/assets/test_exp_id_5.textproto   | 288 ++++++++++++++++++
 ...tate_exp_with_hints_and_solution.textproto |   3 +-
 ...e_exp_with_one_hint_and_solution.textproto |   3 +-
 ...ive_state_exp_with_only_solution.textproto |   3 +-
 ...exp_with_solution_missing_answer.textproto |   1 -
 domain/src/main/assets/test_story_id_0.json   |   4 +-
 domain/src/main/assets/test_topic_id_0_1.json |   5 +-
 domain/src/main/assets/umPkwp0L1M0-.json      | 115 ++++---
 domain/src/main/assets/umPkwp0L1M0-.textproto |  44 +--
 domain/src/main/assets/wANbh4oOClga.json      |   8 +-
 .../hintsandsolution/HelpIndexExtensions.kt   |  23 +-
 .../android/domain/util/StateRetriever.kt     |  64 ++--
 model/src/main/proto/exploration.proto        |  20 +-
 67 files changed, 2006 insertions(+), 784 deletions(-)
 create mode 100644 app/src/main/java/org/oppia/android/app/hintsandsolution/HintViewModel.kt
 create mode 100644 app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionViewModel.kt
 delete mode 100644 app/src/main/java/org/oppia/android/app/hintsandsolution/HintsViewModel.kt
 rename app/src/main/res/layout/{hints_summary.xml => hint_summary.xml} (97%)

diff --git a/app/BUILD.bazel b/app/BUILD.bazel
index af5a6b8ff04..10a17c41919 100644
--- a/app/BUILD.bazel
+++ b/app/BUILD.bazel
@@ -200,7 +200,8 @@ VIEW_MODELS_WITH_RESOURCE_IMPORTS = [
     "src/main/java/org/oppia/android/app/help/thirdparty/LicenseListViewModel.kt",
     "src/main/java/org/oppia/android/app/help/thirdparty/LicenseTextViewModel.kt",
     "src/main/java/org/oppia/android/app/help/thirdparty/ThirdPartyDependencyListViewModel.kt",
-    "src/main/java/org/oppia/android/app/hintsandsolution/HintsViewModel.kt",
+    "src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionViewModel.kt",
+    "src/main/java/org/oppia/android/app/hintsandsolution/SolutionViewModel.kt",
     "src/main/java/org/oppia/android/app/home/HomeViewModel.kt",
     "src/main/java/org/oppia/android/app/home/WelcomeViewModel.kt",
     "src/main/java/org/oppia/android/app/home/promotedlist/ComingSoonTopicsViewModel.kt",
@@ -282,9 +283,9 @@ VIEW_MODELS = [
     "src/main/java/org/oppia/android/app/help/HelpItems.kt",
     "src/main/java/org/oppia/android/app/help/thirdparty/LicenseItemViewModel.kt",
     "src/main/java/org/oppia/android/app/help/thirdparty/ThirdPartyDependencyItemViewModel.kt",
+    "src/main/java/org/oppia/android/app/hintsandsolution/HintViewModel.kt",
     "src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionItemViewModel.kt",
     "src/main/java/org/oppia/android/app/hintsandsolution/ReturnToLessonViewModel.kt",
-    "src/main/java/org/oppia/android/app/hintsandsolution/SolutionViewModel.kt",
     "src/main/java/org/oppia/android/app/home/HomeItemViewModel.kt",
     "src/main/java/org/oppia/android/app/home/promotedlist/ComingSoonTopicListViewModel.kt",
     "src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedItemViewModel.kt",
diff --git a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintViewModel.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintViewModel.kt
new file mode 100644
index 00000000000..2093882c03f
--- /dev/null
+++ b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintViewModel.kt
@@ -0,0 +1,16 @@
+package org.oppia.android.app.hintsandsolution
+
+import androidx.databinding.ObservableBoolean
+import org.oppia.android.util.parser.html.CustomHtmlContentHandler
+
+class HintViewModel(
+  val title: String, val hintSummary: String, val isHintRevealed: ObservableBoolean
+): HintsAndSolutionItemViewModel() {
+  val hintContentDescription: String by lazy {
+    CustomHtmlContentHandler.fromHtml(
+      hintSummary,
+      imageRetriever = null,
+      customTagHandlers = mapOf()
+    ).toString()
+  }
+}
diff --git a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragmentPresenter.kt
index a3a98d4740c..477f8067506 100644
--- a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragmentPresenter.kt
@@ -7,21 +7,16 @@ import androidx.fragment.app.Fragment
 import org.oppia.android.R
 import org.oppia.android.app.fragment.FragmentScope
 import org.oppia.android.app.model.HelpIndex
-import org.oppia.android.app.model.HelpIndex.IndexTypeCase.EVERYTHING_REVEALED
-import org.oppia.android.app.model.HelpIndex.IndexTypeCase.LATEST_REVEALED_HINT_INDEX
-import org.oppia.android.app.model.HelpIndex.IndexTypeCase.NEXT_AVAILABLE_HINT_INDEX
-import org.oppia.android.app.model.HelpIndex.IndexTypeCase.SHOW_SOLUTION
 import org.oppia.android.app.model.ProfileId
 import org.oppia.android.app.model.State
 import org.oppia.android.app.model.WrittenTranslationContext
 import org.oppia.android.app.recyclerview.BindableAdapter
 import org.oppia.android.app.topic.conceptcard.ConceptCardFragment
 import org.oppia.android.app.translation.AppLanguageResourceHandler
-import org.oppia.android.app.viewmodel.ViewModelProvider
 import org.oppia.android.databinding.HintsAndSolutionFragmentBinding
-import org.oppia.android.databinding.HintsSummaryBinding
 import org.oppia.android.databinding.ReturnToLessonButtonItemBinding
 import org.oppia.android.databinding.SolutionSummaryBinding
+import org.oppia.android.databinding.HintSummaryBinding
 import org.oppia.android.util.accessibility.AccessibilityService
 import org.oppia.android.util.gcsresource.DefaultResourceBucketName
 import org.oppia.android.util.parser.html.ExplorationHtmlParserEntityType
@@ -34,33 +29,30 @@ const val TAG_REVEAL_SOLUTION_DIALOG = "REVEAL_SOLUTION_DIALOG"
 @FragmentScope
 class HintsAndSolutionDialogFragmentPresenter @Inject constructor(
   private val fragment: Fragment,
-  private val viewModelProvider: ViewModelProvider<HintsViewModel>,
   private val htmlParserFactory: HtmlParser.Factory,
   @DefaultResourceBucketName private val resourceBucketName: String,
   @ExplorationHtmlParserEntityType private val entityType: String,
   private val resourceHandler: AppLanguageResourceHandler,
-  private val multiTypeBuilderFactory: BindableAdapter.MultiTypeBuilder.Factory
+  private val multiTypeBuilderFactory: BindableAdapter.MultiTypeBuilder.Factory,
+  private val hintsAndSolutionViewModelFactory: HintsAndSolutionViewModel.Factory
 ) : HtmlParser.CustomOppiaTagActionListener {
 
   @Inject
   lateinit var accessibilityService: AccessibilityService
+
   private var index: Int? = null
-  private var expandedItemsList = ArrayList<Int>()
+  private val expandedItemIndexes = mutableListOf<Int>()
   private var isHintRevealed: Boolean? = null
   private var solutionIndex: Int? = null
   private var isSolutionRevealed: Boolean? = null
   private lateinit var expandedHintListIndexListener: ExpandedHintListIndexListener
-  private lateinit var binding: HintsAndSolutionFragmentBinding
   private lateinit var state: State
   private lateinit var helpIndex: HelpIndex
   private lateinit var writtenTranslationContext: WrittenTranslationContext
   private lateinit var profileId: ProfileId
-  private lateinit var itemList: List<HintsAndSolutionItemViewModel>
   private lateinit var bindingAdapter: BindableAdapter<HintsAndSolutionItemViewModel>
-
-  val viewModel by lazy {
-    getHintsAndSolutionViewModel()
-  }
+  private lateinit var explorationId: String
+  private lateinit var viewModel: HintsAndSolutionViewModel
 
   /**
    * Sets up data binding and toolbar.
@@ -72,7 +64,7 @@ class HintsAndSolutionDialogFragmentPresenter @Inject constructor(
     state: State,
     helpIndex: HelpIndex,
     writtenTranslationContext: WrittenTranslationContext,
-    id: String?,
+    explorationId: String,
     expandedItemsList: ArrayList<Int>?,
     expandedHintListIndexListener: ExpandedHintListIndexListener,
     index: Int?,
@@ -81,14 +73,23 @@ class HintsAndSolutionDialogFragmentPresenter @Inject constructor(
     isSolutionRevealed: Boolean?,
     profileId: ProfileId
   ): View {
-    binding =
-      HintsAndSolutionFragmentBinding.inflate(inflater, container, /* attachToRoot= */ false)
-    this.expandedItemsList = expandedItemsList ?: ArrayList()
+    expandedItemIndexes += expandedItemsList ?: listOf()
     this.expandedHintListIndexListener = expandedHintListIndexListener
     this.index = index
     this.isHintRevealed = isHintRevealed
     this.solutionIndex = solutionIndex
     this.isSolutionRevealed = isSolutionRevealed
+    this.state = state
+    this.helpIndex = helpIndex
+    this.writtenTranslationContext = writtenTranslationContext
+    this.profileId = profileId
+    this.explorationId = explorationId
+
+    // Check if hints are available for this state.
+    viewModel = hintsAndSolutionViewModelFactory.create(state, helpIndex, writtenTranslationContext)
+
+    val binding =
+      HintsAndSolutionFragmentBinding.inflate(inflater, container, /* attachToRoot= */ false)
     binding.hintsAndSolutionToolbar.setNavigationIcon(R.drawable.ic_close_white_24dp)
     binding.hintsAndSolutionToolbar.setNavigationContentDescription(
       R.string.hints_andSolution_close_icon_description
@@ -101,67 +102,14 @@ class HintsAndSolutionDialogFragmentPresenter @Inject constructor(
       it.lifecycleOwner = fragment
     }
 
-    this.state = state
-    this.helpIndex = helpIndex
-    this.writtenTranslationContext = writtenTranslationContext
-    this.profileId = profileId
-
-    val newAvailableHintIndex = computeNewAvailableHintIndex(helpIndex)
-    viewModel.newAvailableHintIndex.set(newAvailableHintIndex)
-    viewModel.allHintsExhausted.set(computeWhetherAllHintsAreExhausted(helpIndex))
-    viewModel.explorationId.set(id)
-
-    loadHintsAndSolution(state)
-
-    return binding.root
-  }
-
-  private fun computeNewAvailableHintIndex(helpIndex: HelpIndex): Int {
-    return when (helpIndex.indexTypeCase) {
-      NEXT_AVAILABLE_HINT_INDEX -> helpIndex.nextAvailableHintIndex
-      LATEST_REVEALED_HINT_INDEX -> helpIndex.latestRevealedHintIndex
-      SHOW_SOLUTION, EVERYTHING_REVEALED -> {
-        // 1 is subtracted from the hint count because hints are indexed from 0.
-        state.interaction.hintCount - 1
-      }
-      else ->
-        throw IllegalStateException(
-          "Encountered invalid type for showing hints: ${helpIndex.indexTypeCase}"
-        )
-    }
-  }
-
-  private fun computeWhetherAllHintsAreExhausted(helpIndex: HelpIndex): Boolean {
-    return when (helpIndex.indexTypeCase) {
-      NEXT_AVAILABLE_HINT_INDEX, LATEST_REVEALED_HINT_INDEX -> false
-      SHOW_SOLUTION, EVERYTHING_REVEALED -> true
-      else ->
-        throw IllegalStateException(
-          "Encountered invalid type for showing hints: ${helpIndex.indexTypeCase}"
-        )
-    }
-  }
-
-  private fun loadHintsAndSolution(state: State) {
-    // Check if hints are available for this state.
-    if (state.interaction.hintList.isNotEmpty()) {
-      viewModel.initialize(
-        helpIndex, state.interaction.hintList, state.interaction.solution, writtenTranslationContext
-      )
-
-      itemList = viewModel.processHintList()
-
+    if (state.interaction.hintList.isNotEmpty() || state.interaction.hasSolution()) {
       binding.hintsAndSolutionRecyclerView.apply {
         bindingAdapter = createRecyclerViewAdapter()
         adapter = bindingAdapter
       }
-      if (viewModel.newAvailableHintIndex.get() != -1) {
-        handleNewAvailableHint(viewModel.newAvailableHintIndex.get())
-      }
-      if (viewModel.allHintsExhausted.get()!!) {
-        handleAllHintsExhausted(viewModel.allHintsExhausted.get()!!)
-      }
     }
+
+    return binding.root
   }
 
   private enum class ViewType {
@@ -173,16 +121,16 @@ class HintsAndSolutionDialogFragmentPresenter @Inject constructor(
   private fun createRecyclerViewAdapter(): BindableAdapter<HintsAndSolutionItemViewModel> {
     return multiTypeBuilderFactory.create<HintsAndSolutionItemViewModel, ViewType> { viewModel ->
       when (viewModel) {
-        is HintsViewModel -> ViewType.VIEW_TYPE_HINT_ITEM
+        is HintViewModel -> ViewType.VIEW_TYPE_HINT_ITEM
         is SolutionViewModel -> ViewType.VIEW_TYPE_SOLUTION_ITEM
         is ReturnToLessonViewModel -> ViewType.VIEW_TYPE_RETURN_TO_LESSON_ITEM
         else -> throw IllegalArgumentException("Encountered unexpected view model: $viewModel")
       }
     }.registerViewDataBinder(
       viewType = ViewType.VIEW_TYPE_HINT_ITEM,
-      inflateDataBinding = HintsSummaryBinding::inflate,
-      setViewModel = this::bindHintsViewModel,
-      transformViewModel = { it as HintsViewModel }
+      inflateDataBinding = HintSummaryBinding::inflate,
+      setViewModel = this::bindHintViewModel,
+      transformViewModel = { it as HintViewModel }
     ).registerViewDataBinder(
       viewType = ViewType.VIEW_TYPE_SOLUTION_ITEM,
       inflateDataBinding = SolutionSummaryBinding::inflate,
@@ -196,20 +144,17 @@ class HintsAndSolutionDialogFragmentPresenter @Inject constructor(
     ).build()
   }
 
-  private fun bindHintsViewModel(
-    binding: HintsSummaryBinding,
-    hintsViewModel: HintsViewModel
-  ) {
-    binding.viewModel = hintsViewModel
+  private fun bindHintViewModel(binding: HintSummaryBinding, hintViewModel: HintViewModel) {
+    binding.viewModel = hintViewModel
 
-    val position: Int = itemList.indexOf(hintsViewModel)
+    val position: Int = viewModel.itemList.indexOf(hintViewModel)
 
-    binding.isListExpanded = expandedItemsList.contains(position)
+    binding.isListExpanded = position in expandedItemIndexes
 
     index?.let { index ->
       isHintRevealed?.let { isHintRevealed ->
         if (index == position && isHintRevealed) {
-          hintsViewModel.isHintRevealed.set(true)
+          hintViewModel.isHintRevealed.set(true)
         }
       }
     }
@@ -218,34 +163,31 @@ class HintsAndSolutionDialogFragmentPresenter @Inject constructor(
       htmlParserFactory.create(
         resourceBucketName,
         entityType,
-        hintsViewModel.explorationId.get()!!,
+        explorationId,
         customOppiaTagActionListener = this,
         imageCenterAlign = true,
         displayLocale = resourceHandler.getDisplayLocale()
       ).parseOppiaHtml(
-        hintsViewModel.hintsAndSolutionSummary.get()!!,
+        hintViewModel.hintSummary,
         binding.hintsAndSolutionSummary,
         supportsLinks = true,
         supportsConceptCards = true
       )
 
-    if (hintsViewModel.hintCanBeRevealed.get()!!) {
-      binding.root.visibility = View.VISIBLE
-      binding.revealHintButton.setOnClickListener {
-        hintsViewModel.isHintRevealed.set(true)
-        expandedHintListIndexListener.onRevealHintClicked(position, /* isHintRevealed= */ true)
-        (fragment.requireActivity() as? RevealHintListener)?.revealHint(hintIndex = position)
-        expandOrCollapseItem(position)
-      }
+    binding.revealHintButton.setOnClickListener {
+      hintViewModel.isHintRevealed.set(true)
+      expandedHintListIndexListener.onRevealHintClicked(position, isHintRevealed = true)
+      (fragment.requireActivity() as? RevealHintListener)?.revealHint(hintIndex = position)
+      expandOrCollapseItem(position)
     }
 
     binding.expandableHintHeader.setOnClickListener {
-      if (hintsViewModel.isHintRevealed.get()!!) {
+      if (hintViewModel.isHintRevealed.get()) {
         expandOrCollapseItem(position)
       }
     }
     binding.expandHintListIcon.setOnClickListener {
-      if (hintsViewModel.isHintRevealed.get()!!) {
+      if (hintViewModel.isHintRevealed.get()) {
         expandOrCollapseItem(position)
       }
     }
@@ -260,13 +202,13 @@ class HintsAndSolutionDialogFragmentPresenter @Inject constructor(
   }
 
   private fun expandOrCollapseItem(position: Int) {
-    if (expandedItemsList.contains(position)) {
-      expandedItemsList.remove(position)
+    if (position in expandedItemIndexes) {
+      expandedItemIndexes -= position
     } else {
-      expandedItemsList.add(position)
+      expandedItemIndexes += position
     }
     bindingAdapter.notifyItemChanged(position)
-    expandedHintListIndexListener.onExpandListIconClicked(expandedItemsList)
+    expandedHintListIndexListener.onExpandListIconClicked(ArrayList(expandedItemIndexes))
   }
 
   private fun bindSolutionViewModel(
@@ -275,8 +217,8 @@ class HintsAndSolutionDialogFragmentPresenter @Inject constructor(
   ) {
     binding.viewModel = solutionViewModel
 
-    val position: Int = itemList.indexOf(solutionViewModel)
-    binding.isListExpanded = expandedItemsList.contains(position)
+    val position: Int = viewModel.itemList.indexOf(solutionViewModel)
+    binding.isListExpanded = expandedItemIndexes.contains(position)
 
     solutionIndex?.let { solutionIndex ->
       isSolutionRevealed?.let { isSolutionRevealed ->
@@ -286,48 +228,43 @@ class HintsAndSolutionDialogFragmentPresenter @Inject constructor(
       }
     }
 
-    binding.solutionTitle.text =
-      resourceHandler.capitalizeForHumans(solutionViewModel.title.get()!!)
-    // TODO(#1050): Update to display answers for any answer type.
-    if (solutionViewModel.correctAnswer.get().isNullOrEmpty()) {
-      binding.solutionCorrectAnswer.text =
-        resourceHandler.getStringInLocaleWithoutWrapping(
-          R.string.hints_android_solution_correct_answer,
-          solutionViewModel.numerator.get().toString(),
-          solutionViewModel.denominator.get().toString()
-        )
-    } else {
-      binding.solutionCorrectAnswer.text = solutionViewModel.correctAnswer.get()
-    }
+    binding.solutionCorrectAnswer.text =
+      htmlParserFactory.create(
+        resourceBucketName,
+        entityType,
+        explorationId,
+        imageCenterAlign = true,
+        displayLocale = resourceHandler.getDisplayLocale()
+      ).parseOppiaHtml(
+        solutionViewModel.correctAnswerHtml,
+        binding.solutionCorrectAnswer
+      )
     binding.solutionSummary.text =
       htmlParserFactory.create(
         resourceBucketName,
         entityType,
-        viewModel.explorationId.get()!!,
+        explorationId,
         customOppiaTagActionListener = this,
         imageCenterAlign = true,
         displayLocale = resourceHandler.getDisplayLocale()
       ).parseOppiaHtml(
-        solutionViewModel.solutionSummary.get()!!,
+        solutionViewModel.solutionSummary,
         binding.solutionSummary,
         supportsLinks = true,
         supportsConceptCards = true
       )
 
-    if (solutionViewModel.solutionCanBeRevealed.get()!!) {
-      binding.root.visibility = View.VISIBLE
-      binding.showSolutionButton.setOnClickListener {
-        showRevealSolutionDialogFragment()
-      }
+    binding.showSolutionButton.setOnClickListener {
+      showRevealSolutionDialogFragment()
     }
 
     binding.expandableSolutionHeader.setOnClickListener {
-      if (solutionViewModel.isSolutionRevealed.get()!!) {
+      if (solutionViewModel.isSolutionRevealed.get()) {
         expandOrCollapseItem(position)
       }
     }
     binding.expandSolutionListIcon.setOnClickListener {
-      if (solutionViewModel.isSolutionRevealed.get()!!) {
+      if (solutionViewModel.isSolutionRevealed.get()) {
         expandOrCollapseItem(position)
       }
     }
@@ -352,16 +289,6 @@ class HintsAndSolutionDialogFragmentPresenter @Inject constructor(
     }
   }
 
-  private fun handleAllHintsExhausted(allHintsExhausted: Boolean) {
-    // The last item of the list is ReturnToLessonViewModel and therefore second last item is
-    // SolutionViewModel as a result subtracting 2 from itemList size.
-    if (itemList[itemList.size - 2] is SolutionViewModel) {
-      val solutionViewModel = itemList[itemList.size - 2] as SolutionViewModel
-      solutionViewModel.solutionCanBeRevealed.set(allHintsExhausted)
-      bindingAdapter.notifyItemChanged(itemList.size - 2)
-    }
-  }
-
   private fun showRevealSolutionDialogFragment() {
     val previousFragment =
       fragment.childFragmentManager.findFragmentByTag(TAG_REVEAL_SOLUTION_DIALOG)
@@ -372,29 +299,14 @@ class HintsAndSolutionDialogFragmentPresenter @Inject constructor(
     dialogFragment.showNow(fragment.childFragmentManager, TAG_REVEAL_SOLUTION_DIALOG)
   }
 
-  private fun getHintsAndSolutionViewModel(): HintsViewModel {
-    return viewModelProvider.getForFragment(fragment, HintsViewModel::class.java)
-  }
-
   fun handleRevealSolution() {
-    if (itemList[itemList.size - 2] is SolutionViewModel) {
-      val solutionViewModel = itemList[itemList.size - 2] as SolutionViewModel
-      solutionViewModel.isSolutionRevealed.set(true)
-      expandedHintListIndexListener.onRevealSolutionClicked(
-        /* solutionIndex= */ itemList.size - 2,
-        /* isSolutionRevealed= */ true
-      )
-      (fragment.requireActivity() as? RevealSolutionInterface)?.revealSolution()
-      expandOrCollapseItem(itemList.size - 2)
-    }
-  }
-
-  private fun handleNewAvailableHint(hintIndex: Int?) {
-    if (itemList[hintIndex!!] is HintsViewModel) {
-      val hintsViewModel = itemList[hintIndex] as HintsViewModel
-      hintsViewModel.hintCanBeRevealed.set(true)
-      bindingAdapter.notifyItemChanged(hintIndex)
-    }
+    viewModel.isSolutionRevealed.set(true)
+    expandedHintListIndexListener.onRevealSolutionClicked(
+      solutionIndex = viewModel.solutionIndex,
+      isSolutionRevealed = true
+    )
+    (fragment.requireActivity() as? RevealSolutionInterface)?.revealSolution()
+    expandOrCollapseItem(position = viewModel.solutionIndex)
   }
 
   fun onRevealHintClicked(index: Int?, isHintRevealed: Boolean?) {
diff --git a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionViewModel.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionViewModel.kt
new file mode 100644
index 00000000000..aaa264ba9c4
--- /dev/null
+++ b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionViewModel.kt
@@ -0,0 +1,94 @@
+package org.oppia.android.app.hintsandsolution
+
+import androidx.databinding.ObservableBoolean
+import org.oppia.android.R
+import org.oppia.android.app.fragment.FragmentScope
+import org.oppia.android.app.model.HelpIndex
+import org.oppia.android.app.model.Hint
+import org.oppia.android.app.model.Solution
+import org.oppia.android.app.model.WrittenTranslationContext
+import org.oppia.android.app.translation.AppLanguageResourceHandler
+import org.oppia.android.domain.hintsandsolution.isHintRevealed
+import org.oppia.android.domain.hintsandsolution.isSolutionRevealed
+import org.oppia.android.domain.translation.TranslationController
+import javax.inject.Inject
+import org.oppia.android.app.model.State
+import org.oppia.android.app.viewmodel.ObservableViewModel
+import org.oppia.android.domain.hintsandsolution.dropLastUnavailable
+import org.oppia.android.domain.hintsandsolution.isSolutionAvailable
+
+/** View model for a lesson's hints/solution list. */
+class HintsAndSolutionViewModel private constructor(
+  private val state: State,
+  private val helpIndex: HelpIndex,
+  private val writtenTranslationContext: WrittenTranslationContext,
+  private val resourceHandler: AppLanguageResourceHandler,
+  private val translationController: TranslationController,
+  private val solutionViewModelFactory: SolutionViewModel.Factory
+): ObservableViewModel() {
+  private val hintList by lazy { helpIndex.dropLastUnavailable(state.interaction.hintList) }
+  private val solution by lazy {
+    state.interaction.solution.takeIf { it.hasExplanation() && helpIndex.isSolutionAvailable() }
+  }
+
+  val isSolutionRevealed: ObservableBoolean by lazy {
+    ObservableBoolean(helpIndex.isSolutionRevealed())
+  }
+  val itemList: List<HintsAndSolutionItemViewModel> by lazy { createViewModels() }
+  val solutionIndex: Int get() = itemList.lastIndex - 1
+
+  private fun createViewModels(): List<HintsAndSolutionItemViewModel> {
+    return hintList.mapIndexed { index, hint ->
+      createHintViewModel(
+        index, hint, isHintRevealed = ObservableBoolean(helpIndex.isHintRevealed(index, hintList))
+      )
+    } + listOfNotNull(solution?.let(this::createSolutionViewModel)) + ReturnToLessonViewModel
+  }
+
+  private fun createHintViewModel(
+    hintIndex: Int, hint: Hint, isHintRevealed: ObservableBoolean
+  ): HintViewModel {
+    return HintViewModel(
+      title = resourceHandler.getStringInLocaleWithWrapping(
+        R.string.hint_list_item_number,
+        resourceHandler.toHumanReadableString(hintIndex + 1)
+      ),
+      hintSummary = translationController.extractString(
+        hint.hintContent, writtenTranslationContext
+      ),
+      isHintRevealed = isHintRevealed
+    )
+  }
+
+  private fun createSolutionViewModel(solution: Solution): SolutionViewModel {
+    return solutionViewModelFactory.create(
+      solutionSummary = translationController.extractString(
+        solution.explanation, writtenTranslationContext
+      ),
+      isSolutionRevealed = isSolutionRevealed,
+      isSolutionExclusive = solution.answerIsExclusive,
+      correctAnswer = solution.correctAnswer,
+      interaction = state.interaction,
+      writtenTranslationContext = writtenTranslationContext
+    )
+  }
+
+  class Factory @Inject constructor(
+    private val resourceHandler: AppLanguageResourceHandler,
+    private val translationController: TranslationController,
+    private val solutionViewModelFactory: SolutionViewModel.Factory
+  ) {
+    fun create(
+      state: State, helpIndex: HelpIndex, writtenTranslationContext: WrittenTranslationContext
+    ): HintsAndSolutionViewModel {
+      return HintsAndSolutionViewModel(
+        state,
+        helpIndex,
+        writtenTranslationContext,
+        resourceHandler,
+        translationController,
+        solutionViewModelFactory
+      )
+    }
+  }
+}
diff --git a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsViewModel.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsViewModel.kt
deleted file mode 100644
index b722a9f4a0b..00000000000
--- a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsViewModel.kt
+++ /dev/null
@@ -1,122 +0,0 @@
-package org.oppia.android.app.hintsandsolution
-
-import androidx.databinding.ObservableField
-import androidx.lifecycle.ViewModel
-import org.oppia.android.R
-import org.oppia.android.app.fragment.FragmentScope
-import org.oppia.android.app.model.HelpIndex
-import org.oppia.android.app.model.Hint
-import org.oppia.android.app.model.Solution
-import org.oppia.android.app.model.WrittenTranslationContext
-import org.oppia.android.app.translation.AppLanguageResourceHandler
-import org.oppia.android.domain.hintsandsolution.isHintRevealed
-import org.oppia.android.domain.hintsandsolution.isSolutionRevealed
-import org.oppia.android.domain.translation.TranslationController
-import org.oppia.android.util.parser.html.CustomHtmlContentHandler
-import javax.inject.Inject
-
-private const val DEFAULT_HINT_AND_SOLUTION_SUMMARY = ""
-
-/** [ViewModel] for Hints in [HintsAndSolutionDialogFragment]. */
-@FragmentScope
-class HintsViewModel @Inject constructor(
-  private val resourceHandler: AppLanguageResourceHandler,
-  private val translationController: TranslationController
-) : HintsAndSolutionItemViewModel() {
-
-  val newAvailableHintIndex = ObservableField<Int>(-1)
-  val allHintsExhausted = ObservableField<Boolean>(false)
-  val explorationId = ObservableField<String>("")
-
-  val title = ObservableField<String>("")
-  val hintsAndSolutionSummary = ObservableField(DEFAULT_HINT_AND_SOLUTION_SUMMARY)
-  val isHintRevealed = ObservableField<Boolean>(false)
-  val hintCanBeRevealed = ObservableField<Boolean>(false)
-
-  private lateinit var hintList: List<Hint>
-  private lateinit var solution: Solution
-  private lateinit var helpIndex: HelpIndex
-  private lateinit var writtenTranslationContext: WrittenTranslationContext
-  val itemList: MutableList<HintsAndSolutionItemViewModel> = ArrayList()
-
-  /** Initializes the view model to display hints and a solution. */
-  fun initialize(
-    helpIndex: HelpIndex,
-    hintList: List<Hint>,
-    solution: Solution,
-    writtenTranslationContext: WrittenTranslationContext
-  ) {
-    this.helpIndex = helpIndex
-    this.hintList = hintList
-    this.solution = solution
-    this.writtenTranslationContext = writtenTranslationContext
-  }
-
-  fun processHintList(): List<HintsAndSolutionItemViewModel> {
-    itemList.clear()
-    for (index in hintList.indices) {
-      if (itemList.isEmpty()) {
-        addHintToList(index, hintList[index])
-      } else {
-        val isPriorHintRevealed = (itemList.last() as HintsViewModel).isHintRevealed.get() ?: false
-        val availableHintIndex = newAvailableHintIndex.get() ?: 0
-        if (isPriorHintRevealed && index <= availableHintIndex) {
-          addHintToList(index, hintList[index])
-        } else break
-      }
-    }
-    if (itemList.isNotEmpty()) {
-      val isLastHintRevealed = (itemList.last() as HintsViewModel).isHintRevealed.get() ?: false
-      val areAllHintsExhausted = allHintsExhausted.get() ?: false
-      if (solution.hasExplanation() &&
-        hintList.size == itemList.size &&
-        isLastHintRevealed &&
-        areAllHintsExhausted
-      ) {
-        addSolutionToList(solution)
-      }
-    }
-    itemList.add(ReturnToLessonViewModel())
-    return itemList
-  }
-
-  fun computeHintContentDescription(): String {
-    return hintsAndSolutionSummary.get()?.let {
-      CustomHtmlContentHandler.fromHtml(
-        it,
-        imageRetriever = null,
-        customTagHandlers = mapOf()
-      ).toString()
-    } ?: DEFAULT_HINT_AND_SOLUTION_SUMMARY
-  }
-
-  private fun addHintToList(hintIndex: Int, hint: Hint) {
-    val hintsViewModel = HintsViewModel(resourceHandler, translationController)
-    hintsViewModel.title.set(
-      resourceHandler.getStringInLocaleWithWrapping(
-        R.string.hint_list_item_number,
-        resourceHandler.toHumanReadableString(hintIndex + 1)
-      )
-    )
-    val hintContentHtml =
-      translationController.extractString(hint.hintContent, writtenTranslationContext)
-    hintsViewModel.hintsAndSolutionSummary.set(hintContentHtml)
-    hintsViewModel.isHintRevealed.set(helpIndex.isHintRevealed(hintIndex, hintList))
-    itemList.add(hintsViewModel)
-  }
-
-  private fun addSolutionToList(solution: Solution) {
-    val solutionViewModel = SolutionViewModel()
-    solutionViewModel.title.set(solution.explanation.contentId)
-    solutionViewModel.correctAnswer.set(solution.correctAnswer.correctAnswer)
-    solutionViewModel.numerator.set(solution.correctAnswer.numerator)
-    solutionViewModel.denominator.set(solution.correctAnswer.denominator)
-    solutionViewModel.wholeNumber.set(solution.correctAnswer.wholeNumber)
-    solutionViewModel.isNegative.set(solution.correctAnswer.isNegative)
-    val explanationHtml =
-      translationController.extractString(solution.explanation, writtenTranslationContext)
-    solutionViewModel.solutionSummary.set(explanationHtml)
-    solutionViewModel.isSolutionRevealed.set(helpIndex.isSolutionRevealed())
-    itemList.add(solutionViewModel)
-  }
-}
diff --git a/app/src/main/java/org/oppia/android/app/hintsandsolution/ReturnToLessonViewModel.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/ReturnToLessonViewModel.kt
index 374bb6fd1ef..2c8d4ee846c 100644
--- a/app/src/main/java/org/oppia/android/app/hintsandsolution/ReturnToLessonViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/hintsandsolution/ReturnToLessonViewModel.kt
@@ -3,4 +3,4 @@ package org.oppia.android.app.hintsandsolution
 import androidx.lifecycle.ViewModel
 
 /** [ViewModel] for return to lesson button in [HintsAndSolutionDialogFragment]. */
-class ReturnToLessonViewModel : HintsAndSolutionItemViewModel()
+object ReturnToLessonViewModel : HintsAndSolutionItemViewModel()
diff --git a/app/src/main/java/org/oppia/android/app/hintsandsolution/SolutionViewModel.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/SolutionViewModel.kt
index 82c1c38d997..08ec6bb4805 100644
--- a/app/src/main/java/org/oppia/android/app/hintsandsolution/SolutionViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/hintsandsolution/SolutionViewModel.kt
@@ -1,28 +1,244 @@
 package org.oppia.android.app.hintsandsolution
 
+import androidx.databinding.ObservableBoolean
 import androidx.databinding.ObservableField
 import androidx.lifecycle.ViewModel
+import org.oppia.android.R
+import javax.inject.Inject
+import org.oppia.android.app.model.Interaction
+import org.oppia.android.app.model.InteractionObject
+import org.oppia.android.app.model.InteractionObject.ObjectTypeCase.BOOL_VALUE
+import org.oppia.android.app.model.InteractionObject.ObjectTypeCase.CLICK_ON_IMAGE
+import org.oppia.android.app.model.InteractionObject.ObjectTypeCase.FRACTION
+import org.oppia.android.app.model.InteractionObject.ObjectTypeCase.IMAGE_WITH_REGIONS
+import org.oppia.android.app.model.InteractionObject.ObjectTypeCase.LIST_OF_SETS_OF_HTML_STRING
+import org.oppia.android.app.model.InteractionObject.ObjectTypeCase.LIST_OF_SETS_OF_TRANSLATABLE_HTML_CONTENT_IDS
+import org.oppia.android.app.model.InteractionObject.ObjectTypeCase.MATH_EXPRESSION
+import org.oppia.android.app.model.InteractionObject.ObjectTypeCase.NON_NEGATIVE_INT
+import org.oppia.android.app.model.InteractionObject.ObjectTypeCase.NORMALIZED_STRING
+import org.oppia.android.app.model.InteractionObject.ObjectTypeCase.NUMBER_WITH_UNITS
+import org.oppia.android.app.model.InteractionObject.ObjectTypeCase.OBJECTTYPE_NOT_SET
+import org.oppia.android.app.model.InteractionObject.ObjectTypeCase.RATIO_EXPRESSION
+import org.oppia.android.app.model.InteractionObject.ObjectTypeCase.REAL
+import org.oppia.android.app.model.InteractionObject.ObjectTypeCase.SET_OF_HTML_STRING
+import org.oppia.android.app.model.InteractionObject.ObjectTypeCase.SET_OF_TRANSLATABLE_HTML_CONTENT_IDS
+import org.oppia.android.app.model.InteractionObject.ObjectTypeCase.SIGNED_INT
+import org.oppia.android.app.model.InteractionObject.ObjectTypeCase.TRANSLATABLE_HTML_CONTENT_ID
+import org.oppia.android.app.model.InteractionObject.ObjectTypeCase.TRANSLATABLE_SET_OF_NORMALIZED_STRING
+import org.oppia.android.app.model.MathEquation
+import org.oppia.android.app.model.MathExpression
+import org.oppia.android.app.model.WrittenTranslationContext
+import org.oppia.android.app.translation.AppLanguageResourceHandler
+import org.oppia.android.app.utility.math.MathExpressionAccessibilityUtil
+import org.oppia.android.app.utility.toAccessibleAnswerString
+import org.oppia.android.util.math.MathExpressionParser.Companion.ErrorCheckingMode.REQUIRED_ONLY
+import org.oppia.android.util.math.MathExpressionParser.Companion.MathParsingResult
+import org.oppia.android.util.math.MathExpressionParser.Companion.parseAlgebraicEquation
+import org.oppia.android.util.math.MathExpressionParser.Companion.parseAlgebraicExpression
+import org.oppia.android.util.math.MathExpressionParser.Companion.parseNumericExpression
+import org.oppia.android.util.math.isApproximatelyEqualTo
+import org.oppia.android.util.math.toAnswerString
+import org.oppia.android.util.math.toPlainString
+import org.oppia.android.util.math.toRawLatex
 import org.oppia.android.util.parser.html.CustomHtmlContentHandler
 
 /** [ViewModel] for Solution in [HintsAndSolutionDialogFragment]. */
-class SolutionViewModel : HintsAndSolutionItemViewModel() {
-  val solutionSummary = ObservableField<String>("")
-  val correctAnswer = ObservableField<String>("")
-  val numerator = ObservableField<Int>()
-  val wholeNumber = ObservableField<Int>()
-  val denominator = ObservableField<Int>()
-  val isNegative = ObservableField<Boolean>(false)
-  val title = ObservableField<String>("")
-  val isSolutionRevealed = ObservableField<Boolean>(false)
-  val solutionCanBeRevealed = ObservableField<Boolean>(false)
-
-  fun computeSolutionContentDescription(): String {
-    return solutionSummary.get()?.let {
-      CustomHtmlContentHandler.fromHtml(
-        it,
-        imageRetriever = null,
-        customTagHandlers = mapOf()
-      ).toString()
-    } ?: ""
+class SolutionViewModel private constructor(
+  val solutionSummary: String,
+  private val correctAnswer: InteractionObject,
+  val isSolutionRevealed: ObservableBoolean,
+  isSolutionExclusive: Boolean,
+  private val interaction: Interaction,
+  private val writtenTranslationContext: WrittenTranslationContext,
+  private val appLanguageResourceHandler: AppLanguageResourceHandler,
+  private val mathExpressionAccessibilityUtil: MathExpressionAccessibilityUtil
+) : HintsAndSolutionItemViewModel() {
+  val solutionSummaryContentDescription by lazy {
+    CustomHtmlContentHandler.fromHtml(
+      solutionSummary,
+      imageRetriever = null,
+      customTagHandlers = mapOf()
+    ).toString()
+  }
+  val correctAnswerHtml: String by lazy { computeCorrectAnswerHtml() }
+  val correctAnswerContentDescription: String by lazy { computeCorrectAnswerContentDescription() }
+  private val correctAnswerTextStringResId = if (isSolutionExclusive) {
+    R.string.hints_list_exclusive_solution_text
+  } else R.string.hints_list_possible_solution_text
+
+  private fun computeCorrectAnswerHtml(): String {
+    val answerTextHtml = when (correctAnswer.objectTypeCase) {
+      NORMALIZED_STRING -> correctAnswer.normalizedString
+      REAL -> correctAnswer.real.toSimplifiedPlainString()
+      FRACTION -> correctAnswer.fraction.toAnswerString()
+      RATIO_EXPRESSION -> correctAnswer.ratioExpression.toAnswerString()
+      MATH_EXPRESSION -> when (interaction.id) {
+        "NumericExpressionInput" -> correctAnswer.mathExpression.toNumericExpressionHtml()
+        "AlgebraicExpressionInput" -> correctAnswer.mathExpression.toAlgebraicExpressionHtml()
+        "MathEquationInput" -> correctAnswer.mathExpression.toAlgebraicEquationHtml()
+        else -> error("Interaction ID not valid for math expressions: ${interaction.id}.")
+      }
+      LIST_OF_SETS_OF_TRANSLATABLE_HTML_CONTENT_IDS, SIGNED_INT, NON_NEGATIVE_INT,
+      TRANSLATABLE_SET_OF_NORMALIZED_STRING, TRANSLATABLE_HTML_CONTENT_ID,
+      SET_OF_TRANSLATABLE_HTML_CONTENT_IDS, SET_OF_HTML_STRING, LIST_OF_SETS_OF_HTML_STRING,
+      IMAGE_WITH_REGIONS, CLICK_ON_IMAGE, NUMBER_WITH_UNITS, BOOL_VALUE, OBJECTTYPE_NOT_SET, null ->
+        error("Invalid answer type for solution: $correctAnswer")
+    }
+    return appLanguageResourceHandler.getStringInLocaleWithWrapping(
+      correctAnswerTextStringResId, answerTextHtml
+    )
+  }
+
+  private fun computeCorrectAnswerContentDescription(): String {
+    val readableAnswerText = when (correctAnswer.objectTypeCase) {
+      NORMALIZED_STRING -> correctAnswer.normalizedString
+      REAL -> correctAnswer.real.toSimplifiedReadableString()
+      FRACTION -> correctAnswer.fraction.toAnswerString()
+      RATIO_EXPRESSION ->
+        correctAnswer.ratioExpression.toAccessibleAnswerString(appLanguageResourceHandler)
+      MATH_EXPRESSION -> when (interaction.id) {
+        "NumericExpressionInput" -> correctAnswer.mathExpression.toReadableNumericExpression()
+        "AlgebraicExpressionInput" -> correctAnswer.mathExpression.toReadableAlgebraicExpression()
+        "MathEquationInput" -> correctAnswer.mathExpression.toReadableAlgebraicEquation()
+        else -> error("Interaction ID not valid for math expressions: ${interaction.id}.")
+      }
+      LIST_OF_SETS_OF_TRANSLATABLE_HTML_CONTENT_IDS, SIGNED_INT, NON_NEGATIVE_INT,
+      TRANSLATABLE_SET_OF_NORMALIZED_STRING, TRANSLATABLE_HTML_CONTENT_ID,
+      SET_OF_TRANSLATABLE_HTML_CONTENT_IDS, SET_OF_HTML_STRING, LIST_OF_SETS_OF_HTML_STRING,
+      IMAGE_WITH_REGIONS, CLICK_ON_IMAGE, NUMBER_WITH_UNITS, BOOL_VALUE, OBJECTTYPE_NOT_SET, null ->
+        error("Invalid answer type for solution: $correctAnswer")
+    }
+    return appLanguageResourceHandler.getStringInLocaleWithWrapping(
+      correctAnswerTextStringResId, readableAnswerText
+    )
+  }
+
+  private fun String.toNumericExpressionHtml() =
+    parseNumericExpression().expectSuccess().toRawLatex().wrapAsLatexHtml()
+
+  private fun String.toReadableNumericExpression() =
+    parseNumericExpression().expectSuccess().toReadableString() ?: this
+
+  private fun String.toAlgebraicExpressionHtml() =
+    parseAlgebraicExpression().expectSuccess().toRawLatex().wrapAsLatexHtml()
+
+  private fun String.toReadableAlgebraicExpression() =
+    parseAlgebraicExpression().expectSuccess().toReadableString() ?: this
+
+  private fun String.toAlgebraicEquationHtml() =
+    parseAlgebraicEquation().expectSuccess().toRawLatex().wrapAsLatexHtml()
+
+  private fun String.toReadableAlgebraicEquation() =
+    parseAlgebraicEquation().expectSuccess().toReadableString() ?: this
+
+  private fun String.parseAlgebraicExpression(): MathParsingResult<MathExpression> {
+    return parseAlgebraicExpression(
+      rawExpression = this,
+      allowedVariables = interaction.extractAllowedVariables(),
+      errorCheckingMode = REQUIRED_ONLY
+    )
+  }
+
+  private fun String.parseAlgebraicEquation(): MathParsingResult<MathEquation> {
+    return parseAlgebraicEquation(
+      rawExpression = this,
+      allowedVariables = interaction.extractAllowedVariables(),
+      errorCheckingMode = REQUIRED_ONLY
+    )
+  }
+
+  private fun MathExpression.toRawLatex() =
+    toRawLatex(divAsFraction = interaction.extractUseFractionsForDivision())
+
+  private fun MathEquation.toRawLatex() =
+    toRawLatex(divAsFraction = interaction.extractUseFractionsForDivision())
+
+  private fun MathExpression.toReadableString(): String? {
+    return mathExpressionAccessibilityUtil.convertToHumanReadableString(
+      expression = this,
+      language = writtenTranslationContext.language,
+      divAsFraction = interaction.extractUseFractionsForDivision()
+    )
+  }
+
+  private fun MathEquation.toReadableString(): String? {
+    return mathExpressionAccessibilityUtil.convertToHumanReadableString(
+      equation = this,
+      language = writtenTranslationContext.language,
+      divAsFraction = interaction.extractUseFractionsForDivision()
+    )
+  }
+
+  private fun Double.toSimplifiedReadableString(): String {
+    val longPart = toLong()
+    return if (isApproximatelyEqualTo(longPart.toDouble())) {
+      appLanguageResourceHandler.formatLong(longPart)
+    } else appLanguageResourceHandler.formatDouble(this)
+  }
+
+  private companion object {
+    /**
+     * Returns a plain-string representation of this [Double] with a preference toward dropping the
+     * decimal if it isn't needed for the final answer.
+     */
+    private fun Double.toSimplifiedPlainString(): String {
+      val longPart = toLong()
+      return if (isApproximatelyEqualTo(longPart.toDouble())) {
+        longPart.toString()
+      } else toPlainString()
+    }
+
+    private fun String.parseNumericExpression() =
+      parseNumericExpression(rawExpression = this, errorCheckingMode = REQUIRED_ONLY)
+
+    private fun <T> MathParsingResult<T>.expectSuccess(): T {
+      return when (this) {
+        is MathParsingResult.Success -> result
+        is MathParsingResult.Failure -> error("Invalid parsing result: $error.")
+      }
+    }
+
+    private fun String.wrapAsLatexHtml(): String {
+      val mathContentValue =
+        "{&amp;quot;raw_latex&amp;quot;:&amp;quot;${this.replace("\\", "\\\\")}&amp;quot;}"
+      return "<oppia-noninteractive-math render-type=\"inline\"" +
+        " math_content-with-value=\"$mathContentValue\" />"
+    }
+
+    private fun Interaction.extractAllowedVariables(): List<String> {
+      return customizationArgsMap["customOskLetters"]
+        ?.schemaObjectList
+        ?.schemaObjectList
+        ?.map { it.normalizedString }
+        ?: listOf()
+    }
+
+    private fun Interaction.extractUseFractionsForDivision() =
+      customizationArgsMap["useFractionForDivision"]?.boolValue ?: false
+  }
+
+  class Factory @Inject constructor(
+    private val appLanguageResourceHandler: AppLanguageResourceHandler,
+    private val mathExpressionAccessibilityUtil: MathExpressionAccessibilityUtil
+  ) {
+    fun create(
+      solutionSummary: String,
+      correctAnswer: InteractionObject,
+      isSolutionRevealed: ObservableBoolean,
+      isSolutionExclusive: Boolean,
+      interaction: Interaction,
+      writtenTranslationContext: WrittenTranslationContext
+    ): SolutionViewModel {
+      return SolutionViewModel(
+        solutionSummary,
+        correctAnswer,
+        isSolutionRevealed,
+        isSolutionExclusive,
+        interaction,
+        writtenTranslationContext,
+        appLanguageResourceHandler,
+        mathExpressionAccessibilityUtil
+      )
+    }
   }
 }
diff --git a/app/src/main/java/org/oppia/android/app/player/exploration/HintsAndSolutionExplorationManagerFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/player/exploration/HintsAndSolutionExplorationManagerFragmentPresenter.kt
index 2f7e4613911..59ad3ac71eb 100644
--- a/app/src/main/java/org/oppia/android/app/player/exploration/HintsAndSolutionExplorationManagerFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/player/exploration/HintsAndSolutionExplorationManagerFragmentPresenter.kt
@@ -53,9 +53,10 @@ class HintsAndSolutionExplorationManagerFragmentPresenter @Inject constructor(
       is AsyncResult.Success -> {
         // Check if hints are available for this state.
         val ephemeralState = result.value
-        if (ephemeralState.state.interaction.hintList.size != 0) {
+        val state = ephemeralState.state
+        if (state.interaction.hintList.isNotEmpty() || state.interaction.hasSolution()) {
           (activity as HintsAndSolutionExplorationManagerListener).onExplorationStateLoaded(
-            ephemeralState.state, ephemeralState.writtenTranslationContext
+            state, ephemeralState.writtenTranslationContext
           )
         }
       }
diff --git a/app/src/main/res/layout/hints_summary.xml b/app/src/main/res/layout/hint_summary.xml
similarity index 97%
rename from app/src/main/res/layout/hints_summary.xml
rename to app/src/main/res/layout/hint_summary.xml
index 3491e54b6e2..d06e268a753 100644
--- a/app/src/main/res/layout/hints_summary.xml
+++ b/app/src/main/res/layout/hint_summary.xml
@@ -12,7 +12,7 @@
 
     <variable
       name="viewModel"
-      type="org.oppia.android.app.hintsandsolution.HintsViewModel" />
+      type="org.oppia.android.app.hintsandsolution.HintViewModel" />
   </data>
 
   <androidx.constraintlayout.widget.ConstraintLayout
@@ -126,7 +126,7 @@
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:background="@color/component_color_hints_and_solution_summary_bottom_background_color"
-          android:contentDescription="@{viewModel.computeHintContentDescription()}"
+          android:contentDescription="@{viewModel.hintContentDescription}"
           android:fontFamily="sans-serif"
           android:paddingStart="12dp"
           android:paddingTop="16dp"
diff --git a/app/src/main/res/layout/hints_and_solution_fragment.xml b/app/src/main/res/layout/hints_and_solution_fragment.xml
index 161860f39a6..9bb38809ec5 100644
--- a/app/src/main/res/layout/hints_and_solution_fragment.xml
+++ b/app/src/main/res/layout/hints_and_solution_fragment.xml
@@ -7,7 +7,7 @@
 
     <variable
       name="viewModel"
-      type="org.oppia.android.app.hintsandsolution.HintsViewModel" />
+      type="org.oppia.android.app.hintsandsolution.HintsAndSolutionViewModel" />
   </data>
 
   <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/solution_summary.xml b/app/src/main/res/layout/solution_summary.xml
index 8f2e57c7684..e9c776b7212 100644
--- a/app/src/main/res/layout/solution_summary.xml
+++ b/app/src/main/res/layout/solution_summary.xml
@@ -60,6 +60,7 @@
             android:fontFamily="sans-serif-medium"
             android:textColor="@color/component_color_hints_and_solutions_fragment_text_color"
             android:textSize="20sp"
+            android:text="@string/hint_list_solution_title"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -131,32 +132,14 @@
           android:paddingBottom="16dp"
           android:visibility="@{isListExpanded? View.VISIBLE : View.GONE}">
 
-          <LinearLayout
-            android:layout_width="match_parent"
+          <TextView
+            android:id="@+id/solution_correct_answer"
+            style="@style/TextViewStart"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:importantForAccessibility="yes"
-            android:orientation="horizontal">
-
-            <TextView
-              android:id="@+id/solution_correct_answer_label"
-              style="@style/TextViewStart"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:fontFamily="sans-serif"
-              android:text="@string/the_only_solution_is"
-              android:textColor="@color/component_color_hints_and_solutions_fragment_description_color"
-              android:textSize="16sp" />
-
-            <TextView
-              android:id="@+id/solution_correct_answer"
-              style="@style/TextViewStart"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_marginStart="8dp"
-              android:fontFamily="sans-serif"
-              android:textColor="@color/component_color_hints_and_solutions_fragment_description_color"
-              android:textSize="16sp" />
-          </LinearLayout>
+            android:fontFamily="sans-serif"
+            android:textColor="@color/component_color_hints_and_solutions_fragment_description_color"
+            android:textSize="16sp" />
 
           <LinearLayout
             android:layout_width="match_parent"
@@ -180,7 +163,7 @@
               style="@style/TextViewStart"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
-              android:contentDescription="@{viewModel.computeSolutionContentDescription()}"
+              android:contentDescription="@{viewModel.solutionSummaryContentDescription}"
               android:fontFamily="sans-serif"
               android:textColor="@color/component_color_hints_and_solutions_fragment_description_color"
               android:textSize="16sp" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0542602ad3d..caf6982dc91 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -454,10 +454,12 @@
   <string name="hints_toolbar_title">Hints</string>
   <string name="show_solution">Show solution</string>
   <string name="reveal_solution">Show Solution</string>
+  <string name="hint_list_solution_title">Solution</string>
   <string name="reveal_hint">Show Hint</string>
   <string name="hide_hint">Hide Hint</string>
   <string name="hide_solution">Hide solution</string>
-  <string name="the_only_solution_is">The only solution is:</string>
+  <string name="hints_list_exclusive_solution_text">The only solution is: %s</string>
+  <string name="hints_list_possible_solution_text">One solution is: %s</string>
   <string name="this_will_reveal_the_solution">This will show the solution. Are you sure?</string>
   <string name="reveal">Show</string>
   <!-- TextViewBindingAdapters -->
@@ -532,7 +534,6 @@
   <string name="audio_language_icon_content_description">Change language</string>
   <string name="audio_player_on">Audio, ON</string>
   <string name="audio_player_off">Audio, OFF</string>
-  <string name="hints_android_solution_correct_answer">%s/%s</string>
   <string name="correct_submitted_answer">Correct submitted answer</string>
   <string name="correct_submitted_answer_with_append">Correct submitted answer: %s</string>
   <string name="incorrect_submitted_answer">Incorrect submitted answer</string>
diff --git a/domain/src/main/assets/13.textproto b/domain/src/main/assets/13.textproto
index 0afd6a06b4b..1f6306573ed 100644
--- a/domain/src/main/assets/13.textproto
+++ b/domain/src/main/assets/13.textproto
@@ -549,7 +549,6 @@ states {
               image_path: "Screen Shot 2015-02-18 at 3.51.49 AM_height_400_width_816.png"
               label_regions {
                 label: "Mercury"
-                content_description: "You have selected planet Mercury"
                 region {
                   region_type: RECTANGLE
                   area {
@@ -563,10 +562,10 @@ states {
                     }
                   }
                 }
+                content_description: "You have selected planet Mercury"
               }
               label_regions {
                 label: "Venus"
-                content_description: "You have selected planet Venus"
                 region {
                   region_type: RECTANGLE
                   area {
@@ -580,10 +579,10 @@ states {
                     }
                   }
                 }
+                content_description: "You have selected planet Venus"
               }
               label_regions {
                 label: "Earth"
-                content_description: "You have selected planet Earth"
                 region {
                   region_type: RECTANGLE
                   area {
@@ -597,10 +596,10 @@ states {
                     }
                   }
                 }
+                content_description: "You have selected planet Earth"
               }
               label_regions {
                 label: "Mars"
-                content_description: "You have selected planet Mars"
                 region {
                   region_type: RECTANGLE
                   area {
@@ -614,10 +613,10 @@ states {
                     }
                   }
                 }
+                content_description: "You have selected planet Mars"
               }
               label_regions {
                 label: "Jupiter"
-                content_description: "You have selected planet Jupiter"
                 region {
                   region_type: RECTANGLE
                   area {
@@ -631,10 +630,10 @@ states {
                     }
                   }
                 }
+                content_description: "You have selected planet Jupiter"
               }
               label_regions {
                 label: "Saturn"
-                content_description: "You have selected planet Saturn"
                 region {
                   region_type: RECTANGLE
                   area {
@@ -648,10 +647,10 @@ states {
                     }
                   }
                 }
+                content_description: "You have selected planet Saturn"
               }
               label_regions {
                 label: "Uranus"
-                content_description: "You have selected planet Uranus"
                 region {
                   region_type: RECTANGLE
                   area {
@@ -665,10 +664,10 @@ states {
                     }
                   }
                 }
+                content_description: "You have selected planet Uranus"
               }
               label_regions {
                 label: "Neptune"
-                content_description: "You have selected planet Neptune"
                 region {
                   region_type: RECTANGLE
                   area {
@@ -682,10 +681,10 @@ states {
                     }
                   }
                 }
+                content_description: "You have selected planet Neptune"
               }
               label_regions {
                 label: "Pluto"
-                content_description: "You have selected planet Pluto"
                 region {
                   region_type: RECTANGLE
                   area {
@@ -699,6 +698,7 @@ states {
                     }
                   }
                 }
+                content_description: "You have selected planet Pluto"
               }
             }
           }
diff --git a/domain/src/main/assets/2mzzFVDLuAj8.json b/domain/src/main/assets/2mzzFVDLuAj8.json
index acb06d246f8..9a7eed87bb2 100644
--- a/domain/src/main/assets/2mzzFVDLuAj8.json
+++ b/domain/src/main/assets/2mzzFVDLuAj8.json
@@ -224,7 +224,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 10": {
         "content": {
@@ -510,7 +511,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Introduction": {
         "content": {
@@ -579,7 +581,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Final Test": {
         "content": {
@@ -779,7 +782,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Writing ratio with 3 quantities": {
         "content": {
@@ -1071,7 +1075,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Definition of ratio": {
         "content": {
@@ -1134,7 +1139,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Writing ratio in colon notation": {
         "content": {
@@ -1504,7 +1510,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Congratulations": {
         "content": {
@@ -1555,7 +1562,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Ratio shows relative relationship 2": {
         "content": {
@@ -1618,7 +1626,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Ratio shows relative relationship 1": {
         "content": {
@@ -1792,7 +1801,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Solution": {
         "content": {
@@ -1855,7 +1865,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Fruit purees": {
         "content": {
@@ -1918,7 +1929,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Uncle Berry": {
         "content": {
@@ -1981,7 +1993,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 1": {
         "content": {
@@ -2324,7 +2337,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "A problem": {
         "content": {
@@ -2387,7 +2401,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 3": {
         "content": {
@@ -2711,7 +2726,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 2": {
         "content": {
@@ -3054,7 +3070,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 5": {
         "content": {
@@ -3330,7 +3347,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 4": {
         "content": {
@@ -3538,7 +3556,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 7": {
         "content": {
@@ -3855,7 +3874,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 6": {
         "content": {
@@ -4112,7 +4132,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 9": {
         "content": {
@@ -4415,7 +4436,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 8": {
         "content": {
@@ -4638,7 +4660,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Happy ending": {
         "content": {
@@ -4701,7 +4724,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Tool for describing quantities": {
         "content": {
@@ -4764,7 +4788,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 3.5": {
         "content": {
@@ -4981,7 +5006,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       }
     },
     "objective": "Learn about how ratios can be used to show the relative relationship between quantities.",
diff --git a/domain/src/main/assets/5NWuolNcwH6e.json b/domain/src/main/assets/5NWuolNcwH6e.json
index ff48e14c500..d334766c022 100644
--- a/domain/src/main/assets/5NWuolNcwH6e.json
+++ b/domain/src/main/assets/5NWuolNcwH6e.json
@@ -58,7 +58,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Introduction": {
         "content": {
@@ -109,7 +110,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Ratio when the order is changed": {
         "content": {
@@ -232,7 +234,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Final Test": {
         "content": {
@@ -358,7 +361,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Review 4": {
         "content": {
@@ -498,7 +502,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Review 5": {
         "content": {
@@ -596,7 +601,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Writing ratio using words": {
         "content": {
@@ -779,7 +785,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Review 1": {
         "content": {
@@ -944,7 +951,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Review 2": {
         "content": {
@@ -1149,7 +1157,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Review 3": {
         "content": {
@@ -1275,7 +1284,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Order of number in the ratio is important": {
         "content": {
@@ -1326,7 +1336,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Congratulations": {
         "content": {
@@ -1365,7 +1376,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 1b": {
         "content": {
@@ -1477,7 +1489,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 1": {
         "content": {
@@ -1639,7 +1652,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 3": {
         "content": {
@@ -1801,7 +1815,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 2": {
         "content": {
@@ -1941,7 +1956,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 5": {
         "content": {
@@ -2098,7 +2114,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 4": {
         "content": {
@@ -2405,7 +2422,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 7": {
         "content": {
@@ -2658,7 +2676,9 @@
           }],
           "solution": {
             "answer_is_exclusive": false,
-            "correct_answer": "2:1:5:6",
+            "correct_answer": {
+              "normalized_string": "2:1:5:6"
+            },
             "explanation": {
               "content_id": "solution",
               "html": "<p>Let's write the ratio like this</p>\n\n<blockquote>\n<p>blueberry puree :           milk           : banana puree : dark chocolate</p>\n\n<p>            2              :              5             :              6           :            1</p>\n</blockquote>\n\n<p>Keeping the item together with its corresponding number, we can change the order to what the question asks for. The result looks like this:</p>\n\n<blockquote>\n<p> blueberry puree : dark chocolate :          milk          : banana puree</p>\n\n<p>            2               :              1             :             5             :             6</p>\n</blockquote>\n\n<p>So, the answer is <strong>2:1:5:6</strong>.</p>"
@@ -2729,7 +2749,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Happy ending": {
         "content": {
@@ -2780,7 +2801,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 6": {
         "content": {
@@ -2938,7 +2960,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "James making smoothie alone": {
         "content": {
@@ -3081,7 +3104,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       }
     },
     "objective": "Learn why the order of the numbers in a ratio is important.",
diff --git a/domain/src/main/assets/5NWuolNcwH6e.textproto b/domain/src/main/assets/5NWuolNcwH6e.textproto
index 932303a0f46..cac4f82089f 100644
--- a/domain/src/main/assets/5NWuolNcwH6e.textproto
+++ b/domain/src/main/assets/5NWuolNcwH6e.textproto
@@ -3416,14 +3416,13 @@ states {
         }
       }
       solution {
-        interaction_id: "TextInput"
-        correct_answer {
-          correct_answer: "2:1:5:6"
-        }
         explanation {
           html: "<p>Let\'s write the ratio like this</p>\n\n<blockquote>\n<p>blueberry puree :\302\240 \302\240 \302\240 \302\240 \302\240 \302\240milk\302\240 \302\240 \302\240 \302\240 \302\240 \302\240:\302\240banana puree :\302\240dark chocolate</p>\n\n<p>\302\240 \302\240 \302\240 \302\240 \302\240 \302\240 2\302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 :\302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240\302\2405\302\240 \302\240 \302\240 \302\240 \302\240 \302\240\302\240 :\302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 6\302\240 \302\240 \302\240 \302\240 \302\240 \302\240:\302\240 \302\240 \302\240 \302\240 \302\240 \302\240 1</p>\n</blockquote>\n\n<p>Keeping the item together with its corresponding number, we can change the order to what the question asks for. The result\302\240looks like this:</p>\n\n<blockquote>\n<p>\302\240blueberry puree :\302\240dark chocolate :\302\240 \302\240 \302\240 \302\240 \302\240 milk\302\240 \302\240 \302\240 \302\240 \302\240 : banana puree</p>\n\n<p>\302\240 \302\240 \302\240 \302\240 \302\240 \302\240 2\302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240:\302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 1\302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240:\302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\2405\302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240:\302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\2406</p>\n</blockquote>\n\n<p>So, the answer is <strong>2:1:5:6</strong>.</p>"
           content_id: "solution"
         }
+        correct_answer {
+          normalized_string: "2:1:5:6"
+        }
       }
       hint {
         hint_content {
diff --git a/domain/src/main/assets/GJ2rLXRKD5hw_1.json b/domain/src/main/assets/GJ2rLXRKD5hw_1.json
index 56a8e13bcde..88514dcb1f6 100644
--- a/domain/src/main/assets/GJ2rLXRKD5hw_1.json
+++ b/domain/src/main/assets/GJ2rLXRKD5hw_1.json
@@ -1,6 +1,9 @@
 {
   "topic_id": "GJ2rLXRKD5hw",
-  "topic_name": "Fractions",
+  "topic_title": {
+    "content_id": "title",
+    "html": "What is a Fraction?"
+  },
   "page_contents": {
     "subtitled_html": {
       "content_id": "content",
@@ -13,6 +16,7 @@
     },
     "written_translations": {
       "translations_mapping": {
+        "title": {},
         "content": {}
       }
     }
diff --git a/domain/src/main/assets/GJ2rLXRKD5hw_1.textproto b/domain/src/main/assets/GJ2rLXRKD5hw_1.textproto
index c46eab2de13..00b785c4ae4 100644
--- a/domain/src/main/assets/GJ2rLXRKD5hw_1.textproto
+++ b/domain/src/main/assets/GJ2rLXRKD5hw_1.textproto
@@ -1,5 +1,5 @@
 page_contents {
-  html: "<p>Description of subtopic is here.</p>.<p>This is sample subtopic with dummy content related to Fractions: <oppia-noninteractive-math render-type=\"inline\" math_content-with-value=\"{&amp;quot;raw_latex&amp;quot;:&amp;quot;\\\\frac{\\\\frac{1}{6}}{\\\\frac{1}{2}}&amp;quot;}\"></oppia-noninteractive-math> A lot more text that hopefully wraps to the next line in order to see whether the fraction correctly breaks subsequent text lines since we definitely don't want it to overlap since then it would most certainly not be readable in the least.<p>Fractions represent equal parts of a whole or a collection. Fraction of a whole: When we divide a whole into equal parts, each part is a fraction of the whole. A fraction has two parts. The number on the top of the line is called the numerator. It tells how many equal parts of the whole or collection are taken.  The number below the line is called the denominator.  It shows the total divisible number of equal parts the whole into or the total number of equal parts which are there in a collection. Also, here's the equation for a line using in-line LaTeX: <oppia-noninteractive-math render-type=\"inline\" math_content-with-value=\"{&amp;quot;raw_latex&amp;quot;:&amp;quot;y=mx+b&amp;quot;}\" /><p><oppia-noninteractive-math render-type=\"block\" math_content-with-value=\"{&amp;quot;raw_latex&amp;quot;:&amp;quot;(x + 1)(x - 2) = \\\\frac{(x ^ {3} + 2x ^ {2} - 5x - 6)}{(x + b)}&amp;quot;}\" /><p><oppia-noninteractive-math render-type=\"block\" math_content-with-value=\"{&amp;quot;raw_latex&amp;quot;:&amp;quot;y=mx+b&amp;quot;}\" /><p><oppia-noninteractive-math render-type=\"block\" math_content-with-value=\"{&amp;quot;raw_latex&amp;quot;:&amp;quot;\\\\sqrt{\\\\frac{\\\\frac{\\\\frac{\\\\frac{\\\\frac{\\\\frac{\\\\frac{\\\\frac{1}{2}}{3}}{4}}{5}}{6}}{7}}{8}}{9}}&amp;quot;}\" />"
+  html: "<p>Description of subtopic is here.</p>.<p>This is sample subtopic with dummy content related to Fractions: <oppia-noninteractive-math render-type=\"inline\" math_content-with-value=\"{&amp;quot;raw_latex&amp;quot;:&amp;quot;\\\\frac{\\\\frac{1}{6}}{\\\\frac{1}{2}}&amp;quot;}\"></oppia-noninteractive-math> A lot more text that hopefully wraps to the next line in order to see whether the fraction correctly breaks subsequent text lines since we definitely don\'t want it to overlap since then it would most certainly not be readable in the least.<p>Fractions represent equal parts of a whole or a collection. Fraction of a whole: When we divide a whole into equal parts, each part is a fraction of the whole. A fraction has two parts. The number on the top of the line is called the numerator. It tells how many equal parts of the whole or collection are taken.  The number below the line is called the denominator.  It shows the total divisible number of equal parts the whole into or the total number of equal parts which are there in a collection. Also, here\'s the equation for a line using in-line LaTeX: <oppia-noninteractive-math render-type=\"inline\" math_content-with-value=\"{&amp;quot;raw_latex&amp;quot;:&amp;quot;y=mx+b&amp;quot;}\" /><p><oppia-noninteractive-math render-type=\"block\" math_content-with-value=\"{&amp;quot;raw_latex&amp;quot;:&amp;quot;(x + 1)(x - 2) = \\\\frac{(x ^ {3} + 2x ^ {2} - 5x - 6)}{(x + b)}&amp;quot;}\" /><p><oppia-noninteractive-math render-type=\"block\" math_content-with-value=\"{&amp;quot;raw_latex&amp;quot;:&amp;quot;y=mx+b&amp;quot;}\" /><p><oppia-noninteractive-math render-type=\"block\" math_content-with-value=\"{&amp;quot;raw_latex&amp;quot;:&amp;quot;\\\\sqrt{\\\\frac{\\\\frac{\\\\frac{\\\\frac{\\\\frac{\\\\frac{\\\\frac{\\\\frac{1}{2}}{3}}{4}}{5}}{6}}{7}}{8}}{9}}&amp;quot;}\" />"
   content_id: "content"
 }
 recorded_voiceover {
@@ -8,12 +8,12 @@ recorded_voiceover {
   }
 }
 written_translation {
-  key: "content"
+  key: "title"
   value {
   }
 }
 written_translation {
-  key: "title"
+  key: "content"
   value {
   }
 }
diff --git a/domain/src/main/assets/GJ2rLXRKD5hw_2.json b/domain/src/main/assets/GJ2rLXRKD5hw_2.json
index 5faf47cf8f9..bf9286e3b7f 100644
--- a/domain/src/main/assets/GJ2rLXRKD5hw_2.json
+++ b/domain/src/main/assets/GJ2rLXRKD5hw_2.json
@@ -1,6 +1,9 @@
 {
   "topic_id": "GJ2rLXRKD5hw",
-  "topic_name": "Fractions",
+  "topic_title": {
+    "content_id": "title",
+    "html": "Fractions of a group"
+  },
   "page_contents": {
     "subtitled_html": {
       "content_id": "content",
@@ -13,6 +16,7 @@
     },
     "written_translations": {
       "translations_mapping": {
+        "title": {},
         "content": {}
       }
     }
diff --git a/domain/src/main/assets/GJ2rLXRKD5hw_2.textproto b/domain/src/main/assets/GJ2rLXRKD5hw_2.textproto
index 92d90fee1b4..db5fd6f9cd0 100644
--- a/domain/src/main/assets/GJ2rLXRKD5hw_2.textproto
+++ b/domain/src/main/assets/GJ2rLXRKD5hw_2.textproto
@@ -8,12 +8,12 @@ recorded_voiceover {
   }
 }
 written_translation {
-  key: "content"
+  key: "title"
   value {
   }
 }
 written_translation {
-  key: "title"
+  key: "content"
   value {
   }
 }
diff --git a/domain/src/main/assets/GJ2rLXRKD5hw_3.json b/domain/src/main/assets/GJ2rLXRKD5hw_3.json
index a0d00ea619b..b76888b325b 100644
--- a/domain/src/main/assets/GJ2rLXRKD5hw_3.json
+++ b/domain/src/main/assets/GJ2rLXRKD5hw_3.json
@@ -1,6 +1,9 @@
 {
   "topic_id": "GJ2rLXRKD5hw",
-  "topic_name": "Fractions",
+  "topic_title": {
+    "content_id": "title",
+    "html": "Mixed Numbers"
+  },
   "page_contents": {
     "subtitled_html": {
       "content_id": "content",
@@ -13,6 +16,7 @@
     },
     "written_translations": {
       "translations_mapping": {
+        "title": {},
         "content": {}
       }
     }
diff --git a/domain/src/main/assets/GJ2rLXRKD5hw_3.textproto b/domain/src/main/assets/GJ2rLXRKD5hw_3.textproto
index ea6d09359f0..96b5df7b713 100644
--- a/domain/src/main/assets/GJ2rLXRKD5hw_3.textproto
+++ b/domain/src/main/assets/GJ2rLXRKD5hw_3.textproto
@@ -8,12 +8,12 @@ recorded_voiceover {
   }
 }
 written_translation {
-  key: "content"
+  key: "title"
   value {
   }
 }
 written_translation {
-  key: "title"
+  key: "content"
   value {
   }
 }
diff --git a/domain/src/main/assets/GJ2rLXRKD5hw_4.json b/domain/src/main/assets/GJ2rLXRKD5hw_4.json
index a224a1b1043..f217358628a 100644
--- a/domain/src/main/assets/GJ2rLXRKD5hw_4.json
+++ b/domain/src/main/assets/GJ2rLXRKD5hw_4.json
@@ -1,6 +1,9 @@
 {
   "topic_id": "GJ2rLXRKD5hw",
-  "topic_name": "Fractions",
+  "topic_title": {
+    "content_id": "title",
+    "html": "Adding Fractions"
+  },
   "page_contents": {
     "subtitled_html": {
       "content_id": "content",
@@ -13,6 +16,7 @@
     },
     "written_translations": {
       "translations_mapping": {
+        "title": {},
         "content": {}
       }
     }
diff --git a/domain/src/main/assets/GJ2rLXRKD5hw_4.textproto b/domain/src/main/assets/GJ2rLXRKD5hw_4.textproto
index 8ebbdf2f863..6a92d9ea483 100644
--- a/domain/src/main/assets/GJ2rLXRKD5hw_4.textproto
+++ b/domain/src/main/assets/GJ2rLXRKD5hw_4.textproto
@@ -8,12 +8,12 @@ recorded_voiceover {
   }
 }
 written_translation {
-  key: "content"
+  key: "title"
   value {
   }
 }
 written_translation {
-  key: "title"
+  key: "content"
   value {
   }
 }
diff --git a/domain/src/main/assets/MjZzEVOG47_1.json b/domain/src/main/assets/MjZzEVOG47_1.json
index 01f230ea14b..c4ac2fe7e1d 100644
--- a/domain/src/main/assets/MjZzEVOG47_1.json
+++ b/domain/src/main/assets/MjZzEVOG47_1.json
@@ -309,7 +309,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Thinking in fractions Q3": {
         "content": {
@@ -453,10 +454,12 @@
           "solution": {
             "answer_is_exclusive": false,
             "correct_answer": {
-              "isNegative": false,
-              "wholeNumber": 0,
-              "numerator": 5,
-              "denominator": 8
+              "fraction": {
+                "isNegative": false,
+                "wholeNumber": 0,
+                "numerator": 5,
+                "denominator": 8
+              }
             },
             "explanation": {
               "content_id": "solution",
@@ -666,7 +669,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Thinking in fractions Q2": {
         "content": {
@@ -855,10 +859,12 @@
           "solution": {
             "answer_is_exclusive": false,
             "correct_answer": {
-              "isNegative": false,
-              "wholeNumber": 0,
-              "numerator": 4,
-              "denominator": 9
+              "fraction": {
+                "isNegative": false,
+                "wholeNumber": 0,
+                "numerator": 4,
+                "denominator": 9
+              }
             },
             "explanation": {
               "content_id": "solution",
@@ -1080,7 +1086,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Thinking in fractions Q1": {
         "content": {
@@ -1268,10 +1275,12 @@
           "solution": {
             "answer_is_exclusive": true,
             "correct_answer": {
-              "isNegative": false,
-              "wholeNumber": 0,
-              "numerator": 7,
-              "denominator": 9
+              "fraction": {
+                "isNegative": false,
+                "wholeNumber": 0,
+                "numerator": 7,
+                "denominator": 9
+              }
             },
             "explanation": {
               "content_id": "solution",
@@ -1502,7 +1511,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Thinking in fractions Q4": {
         "content": {
@@ -1663,10 +1673,12 @@
           "solution": {
             "answer_is_exclusive": true,
             "correct_answer": {
-              "isNegative": false,
-              "wholeNumber": 0,
-              "numerator": 3,
-              "denominator": 4
+              "fraction": {
+                "isNegative": false,
+                "wholeNumber": 0,
+                "numerator": 3,
+                "denominator": 4
+              }
             },
             "explanation": {
               "content_id": "solution",
@@ -1894,7 +1906,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Matthew gets conned": {
         "content": {
@@ -2182,10 +2195,12 @@
           "solution": {
             "answer_is_exclusive": true,
             "correct_answer": {
-              "isNegative": false,
-              "wholeNumber": 0,
-              "numerator": 3,
-              "denominator": 4
+              "fraction": {
+                "isNegative": false,
+                "wholeNumber": 0,
+                "numerator": 3,
+                "denominator": 4
+              }
             },
             "explanation": {
               "content_id": "solution",
@@ -2656,7 +2671,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Into the Bakery": {
         "content": {
@@ -2694,7 +2710,7 @@
               "dest": "Matthew gets conned",
               "feedback": {
                 "content_id": "feedback_1",
-                "html": ""
+                "html": "<p>Yes, that's right -- congratulations, you figured out Crumb's trick!</p><p>Let's see what happens to Matthew, though...</p>"
               },
               "labelled_as_correct": true,
               "param_changes": [],
@@ -2859,7 +2875,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Question 4": {
         "content": {
@@ -3131,10 +3148,12 @@
           "solution": {
             "answer_is_exclusive": false,
             "correct_answer": {
-              "isNegative": false,
-              "wholeNumber": 0,
-              "numerator": 8,
-              "denominator": 16
+              "fraction": {
+                "isNegative": false,
+                "wholeNumber": 0,
+                "numerator": 8,
+                "denominator": 16
+              }
             },
             "explanation": {
               "content_id": "solution",
@@ -3446,7 +3465,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Question 5": {
         "content": {
@@ -3881,7 +3901,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Question 2": {
         "content": {
@@ -4135,10 +4156,12 @@
           "solution": {
             "answer_is_exclusive": false,
             "correct_answer": {
-              "isNegative": false,
-              "wholeNumber": 0,
-              "numerator": 2,
-              "denominator": 8
+              "fraction": {
+                "isNegative": false,
+                "wholeNumber": 0,
+                "numerator": 2,
+                "denominator": 8
+              }
             },
             "explanation": {
               "content_id": "solution",
@@ -4522,7 +4545,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Question 3": {
         "content": {
@@ -4800,10 +4824,12 @@
           "solution": {
             "answer_is_exclusive": false,
             "correct_answer": {
-              "isNegative": false,
-              "wholeNumber": 0,
-              "numerator": 1,
-              "denominator": 8
+              "fraction": {
+                "isNegative": false,
+                "wholeNumber": 0,
+                "numerator": 1,
+                "denominator": 8
+              }
             },
             "explanation": {
               "content_id": "solution",
@@ -5241,7 +5267,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Question 1": {
         "content": {
@@ -5517,10 +5544,12 @@
           "solution": {
             "answer_is_exclusive": true,
             "correct_answer": {
-              "isNegative": false,
-              "wholeNumber": 0,
-              "numerator": 4,
-              "denominator": 9
+              "fraction": {
+                "isNegative": false,
+                "wholeNumber": 0,
+                "numerator": 4,
+                "denominator": 9
+              }
             },
             "explanation": {
               "content_id": "solution",
@@ -5943,7 +5972,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Congratulations": {
         "content": {
@@ -5994,7 +6024,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Final Test A": {
         "content": {
@@ -6173,7 +6204,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Final Test B": {
         "content": {
@@ -6352,7 +6384,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Final Test C": {
         "content": {
@@ -6531,7 +6564,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Final Test B second try": {
         "content": {
@@ -6762,7 +6796,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Happy ending": {
         "content": {
@@ -6825,7 +6860,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       }
     },
     "objective": "Learn how to write fractions when the parts of a picture are not equal",
diff --git a/domain/src/main/assets/MjZzEVOG47_1.textproto b/domain/src/main/assets/MjZzEVOG47_1.textproto
index def5ee165ee..5222ac203d1 100644
--- a/domain/src/main/assets/MjZzEVOG47_1.textproto
+++ b/domain/src/main/assets/MjZzEVOG47_1.textproto
@@ -735,15 +735,16 @@ states {
         }
       }
       solution {
-        interaction_id: "FractionInput"
-        correct_answer {
-          denominator: 8
-          numerator: 5
-        }
         explanation {
           html: "<p>Start by drawing a rectangle cut into 8 equal pieces.</p><oppia-noninteractive-image alt-with-value=\"&amp;quot;2x4 rectangle with 3 squares shaded.&amp;quot;\" caption-with-value=\"&amp;quot;&amp;quot;\" filepath-with-value=\"&amp;quot;img_20180111_001749_txtq5umhxy_height_140_width_237.png&amp;quot;\"></oppia-noninteractive-image><p>3 pieces are shaded. The pieces that are left over are white. There are 5 white pieces, and there are 8 pieces in total. So the answer is 5/8.</p>"
           content_id: "solution"
         }
+        correct_answer {
+          fraction {
+            numerator: 5
+            denominator: 8
+          }
+        }
       }
       hint {
         hint_content {
@@ -1243,15 +1244,16 @@ states {
         }
       }
       solution {
-        interaction_id: "FractionInput"
-        correct_answer {
-          denominator: 9
-          numerator: 4
-        }
         explanation {
           html: "<p>Let\'s start by drawing a picture. We can represent the cake using 9 equal parts, since that will make it easy to colour Matthew\'s and Mr. Baker\'s parts later. Here\'s a drawing:</p><oppia-noninteractive-image alt-with-value=\"&amp;quot;3x3 grid with 2 pieces shaded brown and 3 shaded green.&amp;quot;\" caption-with-value=\"&amp;quot;&amp;quot;\" filepath-with-value=\"&amp;quot;img_20180111_001207_zz3uj8elu2_height_174_width_178.png&amp;quot;\"></oppia-noninteractive-image><p>\302\240</p><p>Matthew gets 2/9 of the cake (the brown parts) and Mr. Baker gets 3/9 of the cake (the green parts). There are 4 squares left over (the white parts), and there are 9 squares in total. So the answer is 4/9.</p>"
           content_id: "solution"
         }
+        correct_answer {
+          fraction {
+            numerator: 4
+            denominator: 9
+          }
+        }
       }
       hint {
         hint_content {
@@ -1754,16 +1756,17 @@ states {
         }
       }
       solution {
-        interaction_id: "FractionInput"
         answer_is_exclusive: true
-        correct_answer {
-          denominator: 9
-          numerator: 7
-        }
         explanation {
           html: "<p>Here\'s a picture showing the 2/9 of the cake that Crumb gave Matthew:</p><oppia-noninteractive-image alt-with-value=\"&amp;quot;3x3 grid with two squares shaded.&amp;quot;\" caption-with-value=\"&amp;quot;&amp;quot;\" filepath-with-value=\"&amp;quot;img_20180110_234657_n9pplulvrx_height_174_width_178.png&amp;quot;\"></oppia-noninteractive-image><p>The fraction of the cake that\'s left over is represented by the white pieces. There are 7 white pieces, and there are 9 pieces in total. So the answer is 7/9.</p>"
           content_id: "solution"
         }
+        correct_answer {
+          fraction {
+            numerator: 7
+            denominator: 9
+          }
+        }
       }
       hint {
         hint_content {
@@ -2240,16 +2243,17 @@ states {
         }
       }
       solution {
-        interaction_id: "FractionInput"
         answer_is_exclusive: true
-        correct_answer {
-          denominator: 4
-          numerator: 3
-        }
         explanation {
           html: "<p>We can draw a square and colour\302\2401/2\302\240and\302\2401/4\302\240of it, like this:</p><oppia-noninteractive-image alt-with-value=\"&amp;quot;Square with 1/2 + 1/4 shaded.&amp;quot;\" caption-with-value=\"&amp;quot;&amp;quot;\" filepath-with-value=\"&amp;quot;img_20180111_003734_d0p3w9pl9j_height_108_width_110.png&amp;quot;\"></oppia-noninteractive-image><p>To find the resulting fraction, we divide the square into equal parts:</p><oppia-noninteractive-image alt-with-value=\"&amp;quot;Square divided into 4 equal parts, with 3 coloured red.&amp;quot;\" caption-with-value=\"&amp;quot;&amp;quot;\" filepath-with-value=\"&amp;quot;img_20180111_003831_i9pje0cg68_height_120_width_122.png&amp;quot;\"></oppia-noninteractive-image><p>There are 4 equal parts, and 3 of them are red, so the correct answer is <strong>3/4</strong>.</p><p>\302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240-----------------------------------------------------\302\240</p><p>Note: You may think that you could just add\302\240the numerators and denominators of the fractions\302\240to get 2/6, but that\302\240is the <strong>wrong\302\240answer</strong>! The important thing is the<strong>\302\240amount</strong> represented by the fraction, not the actual numbers (like 1 and 2) that are used to write the fraction.</p><p><strong>Drawing a clear picture</strong>\302\240is a good strategy to help you \"see\" that amount.</p>"
           content_id: "solution"
         }
+        correct_answer {
+          fraction {
+            numerator: 3
+            denominator: 4
+          }
+        }
       }
       hint {
         hint_content {
@@ -2955,6 +2959,7 @@ states {
         outcome {
           dest_state_name: "Question 1"
           feedback {
+            html: "<p>Yes, that\'s right! Well done.</p>"
             content_id: "feedback_1"
           }
           labelled_as_correct: true
@@ -3154,16 +3159,17 @@ states {
         }
       }
       solution {
-        interaction_id: "FractionInput"
         answer_is_exclusive: true
-        correct_answer {
-          denominator: 4
-          numerator: 3
-        }
         explanation {
           html: "<p>Start by dividing the cake into equal parts:</p><oppia-noninteractive-image alt-with-value=\"&amp;quot;Circle divided into four quadrants; three of them are shaded red.&amp;quot;\" caption-with-value=\"&amp;quot;&amp;quot;\" filepath-with-value=\"&amp;quot;img_20180110_222526_mz5fedlya5_height_236_width_225.png&amp;quot;\"></oppia-noninteractive-image><p>Three of the four equal parts are red. So, the answer is 3/4.</p>"
           content_id: "solution"
         }
+        correct_answer {
+          fraction {
+            numerator: 3
+            denominator: 4
+          }
+        }
       }
       hint {
         hint_content {
@@ -4115,15 +4121,16 @@ states {
         }
       }
       solution {
-        interaction_id: "FractionInput"
-        correct_answer {
-          denominator: 16
-          numerator: 8
-        }
         explanation {
           html: "<p>The smallest piece is a triangle, so let\'s start by dividing the square into triangles. Here is the result:</p><oppia-noninteractive-image alt-with-value=\"&amp;quot;Square fully divided into triangles&amp;quot;\" caption-with-value=\"&amp;quot;&amp;quot;\" filepath-with-value=\"&amp;quot;img_20180110_233341_9vhldai18y_height_132_width_129.png&amp;quot;\"></oppia-noninteractive-image><p>There are 16 equal pieces. 8 of them are blue. So the answer is 8/16.</p>"
           content_id: "solution"
         }
+        correct_answer {
+          fraction {
+            numerator: 8
+            denominator: 16
+          }
+        }
       }
       hint {
         hint_content {
@@ -5396,15 +5403,16 @@ states {
         }
       }
       solution {
-        interaction_id: "FractionInput"
-        correct_answer {
-          denominator: 8
-          numerator: 2
-        }
         explanation {
           html: "<p>Start by dividing the cake into equal parts:</p><oppia-noninteractive-image alt-with-value=\"&amp;quot;The same cake, divided into 8 equal pieces.&amp;quot;\" caption-with-value=\"&amp;quot;&amp;quot;\" filepath-with-value=\"&amp;quot;img_20180110_225537_8lq4yktbcd_height_245_width_245.png&amp;quot;\"></oppia-noninteractive-image><p>Two of the eight equal parts are darkened. So the answer is 2/8.</p>"
           content_id: "solution"
         }
+        correct_answer {
+          fraction {
+            numerator: 2
+            denominator: 8
+          }
+        }
       }
       hint {
         hint_content {
@@ -6251,15 +6259,16 @@ states {
         }
       }
       solution {
-        interaction_id: "FractionInput"
-        correct_answer {
-          denominator: 8
-          numerator: 1
-        }
         explanation {
           html: "<p>First, divide the whole square into <strong>equal parts</strong>:</p><oppia-noninteractive-image alt-with-value=\"&amp;quot;Square divided into eight equal rectangles, with one of them coloured green.&amp;quot;\" caption-with-value=\"&amp;quot;&amp;quot;\" filepath-with-value=\"&amp;quot;img_20180110_230950_orynqmeohw_height_115_width_112.png&amp;quot;\"></oppia-noninteractive-image><p>Of these 8 equal parts, exactly 1 is green. So the answer is 1/8.</p>"
           content_id: "solution"
         }
+        correct_answer {
+          fraction {
+            numerator: 1
+            denominator: 8
+          }
+        }
       }
       hint {
         hint_content {
@@ -7092,16 +7101,17 @@ states {
         }
       }
       solution {
-        interaction_id: "FractionInput"
         answer_is_exclusive: true
-        correct_answer {
-          denominator: 9
-          numerator: 4
-        }
         explanation {
           html: "<p>First, divide the cake up into equal parts:</p><oppia-noninteractive-image alt-with-value=\"&amp;quot;Square cake divided into 9 equal pieces, with 4 shaded.&amp;quot;\" caption-with-value=\"&amp;quot;&amp;quot;\" filepath-with-value=\"&amp;quot;img_20180110_223145_41bn17po8w_height_240_width_240.png&amp;quot;\"></oppia-noninteractive-image><p>Four of the nine equal parts are darkened. So, the answer is 4/9.</p>"
           content_id: "solution"
         }
+        correct_answer {
+          fraction {
+            numerator: 4
+            denominator: 9
+          }
+        }
       }
       hint {
         hint_content {
diff --git a/domain/src/main/assets/k2bQ7z5XHNbK.json b/domain/src/main/assets/k2bQ7z5XHNbK.json
index fea8f365548..93391dd0489 100644
--- a/domain/src/main/assets/k2bQ7z5XHNbK.json
+++ b/domain/src/main/assets/k2bQ7z5XHNbK.json
@@ -189,7 +189,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 11": {
         "content": {
@@ -346,7 +347,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 10": {
         "content": {
@@ -531,7 +533,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Introduction": {
         "content": {
@@ -582,7 +585,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Final Test": {
         "content": {
@@ -722,7 +726,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Multiplying and dividing a number to ratio": {
         "content": {
@@ -879,7 +884,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 5.5": {
         "content": {
@@ -1036,7 +1042,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Smoothie for stand": {
         "content": {
@@ -1232,7 +1239,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Definition of a ratio": {
         "content": {
@@ -1283,7 +1291,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Review 1": {
         "content": {
@@ -1417,7 +1426,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Review 2": {
         "content": {
@@ -1512,7 +1522,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Review 3": {
         "content": {
@@ -1649,7 +1660,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Congratulations": {
         "content": {
@@ -1688,7 +1700,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 1": {
         "content": {
@@ -1890,7 +1903,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 3": {
         "content": {
@@ -2083,7 +2097,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 2": {
         "content": {
@@ -2251,7 +2266,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 5": {
         "content": {
@@ -2377,7 +2393,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 4": {
         "content": {
@@ -2503,7 +2520,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 7": {
         "content": {
@@ -2657,7 +2675,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 6": {
         "content": {
@@ -2803,7 +2822,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 9": {
         "content": {
@@ -2929,7 +2949,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 8": {
         "content": {
@@ -3102,7 +3123,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Happy ending": {
         "content": {
@@ -3153,7 +3175,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Equivalent ratio": {
         "content": {
@@ -3204,7 +3227,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       }
     },
     "objective": "Learn how to find equivalent ratios, and how to simplify ratios.",
diff --git a/domain/src/main/assets/omzF4oqgeTXd_1.json b/domain/src/main/assets/omzF4oqgeTXd_1.json
index e323bca7ea0..c73704d838b 100644
--- a/domain/src/main/assets/omzF4oqgeTXd_1.json
+++ b/domain/src/main/assets/omzF4oqgeTXd_1.json
@@ -1,6 +1,9 @@
 {
   "topic_id": "omzF4oqgeTXd",
-  "topic_name": "Ratios and Proportional Reasoning",
+  "topic_title": {
+    "content_id": "title",
+    "html": "What is a Ratio?"
+  },
   "page_contents": {
     "subtitled_html": {
       "content_id": "content",
@@ -13,6 +16,7 @@
     },
     "written_translations": {
       "translations_mapping": {
+        "title": {},
         "content": {}
       }
     }
diff --git a/domain/src/main/assets/omzF4oqgeTXd_1.textproto b/domain/src/main/assets/omzF4oqgeTXd_1.textproto
index 834552d9ef4..80bdb7bfaea 100644
--- a/domain/src/main/assets/omzF4oqgeTXd_1.textproto
+++ b/domain/src/main/assets/omzF4oqgeTXd_1.textproto
@@ -8,12 +8,12 @@ recorded_voiceover {
   }
 }
 written_translation {
-  key: "content"
+  key: "title"
   value {
   }
 }
 written_translation {
-  key: "title"
+  key: "content"
   value {
   }
 }
diff --git a/domain/src/main/assets/questions.json b/domain/src/main/assets/questions.json
index fcb17c4b94b..99765433509 100644
--- a/domain/src/main/assets/questions.json
+++ b/domain/src/main/assets/questions.json
@@ -114,7 +114,9 @@
         }],
         "solution": {
           "answer_is_exclusive": false,
-          "correct_answer": "1/4",
+          "correct_answer": {
+            "normalized_string": "1/4"
+          },
           "explanation": {
             "content_id": "solution",
             "html": "<p>Removing one of the lines on the right results in a square that is divided into 4 equal pieces:</p>\n<oppia-noninteractive-image alt-with-value=\"&amp;quot;A square divided into four pieces by the diagonals. The left piece is shaded.&amp;quot;\" caption-with-value=\"&amp;quot;&amp;quot;\" filepath-with-value=\"&amp;quot;img_20191031_012904_7vi149rtw5_height_132_width_145.png&amp;quot;\"></oppia-noninteractive-image>\n\n<p>So, the fraction represented by the shaded area is 1/4.</p>"
@@ -145,7 +147,8 @@
         }
       },
       "solicit_answer_details": false,
-      "next_content_id_index": -1
+      "next_content_id_index": -1,
+      "linked_skill_id": null
     },
     "language_code": "en",
     "version": 3,
@@ -258,7 +261,9 @@
         }],
         "solution": {
           "answer_is_exclusive": false,
-          "correct_answer": "1/4",
+          "correct_answer": {
+            "normalized_string": "1/4"
+          },
           "explanation": {
             "content_id": "solution",
             "html": "<p>First, let's divide the picture into equal parts:</p>\n<oppia-noninteractive-image alt-with-value=\"&amp;quot;An equilateral triangle divided into 4 equal parts. 1 part is shaded red.&amp;quot;\" caption-with-value=\"&amp;quot;&amp;quot;\" filepath-with-value=\"&amp;quot;img_20191031_011934_xbds5ar8ma_height_130_width_106.png&amp;quot;\"></oppia-noninteractive-image>\n\n<p>There are 4 parts in total, and 1 of them is red, so the fraction is <strong>1/4</strong>.</p>"
@@ -289,7 +294,8 @@
         }
       },
       "solicit_answer_details": false,
-      "next_content_id_index": -1
+      "next_content_id_index": -1,
+      "linked_skill_id": null
     },
     "language_code": "en",
     "version": 3,
@@ -418,7 +424,9 @@
         }],
         "solution": {
           "answer_is_exclusive": false,
-          "correct_answer": "6/8",
+          "correct_answer": {
+            "normalized_string": "6/8"
+          },
           "explanation": {
             "content_id": "solution",
             "html": "<p>You can divide the picture into equal-sized triangles by drawing an extra diagonal line:</p>\n<oppia-noninteractive-image alt-with-value=\"&amp;quot;A square divided into eight equal triangles. Six of the triangles are green.&amp;quot;\" caption-with-value=\"&amp;quot;&amp;quot;\" filepath-with-value=\"&amp;quot;img_20191031_011013_fqn27hl9aq_height_96_width_93.png&amp;quot;\"></oppia-noninteractive-image>\n\n<p>There are 8 parts in total, and 6 of them are green. So, the fraction represented is&nbsp;<strong>6/8</strong>.</p>"
@@ -449,7 +457,8 @@
         }
       },
       "solicit_answer_details": false,
-      "next_content_id_index": -1
+      "next_content_id_index": -1,
+      "linked_skill_id": null
     },
     "language_code": "en",
     "version": 4,
@@ -614,7 +623,8 @@
         }
       },
       "solicit_answer_details": false,
-      "next_content_id_index": -1
+      "next_content_id_index": -1,
+      "linked_skill_id": null
     },
     "language_code": "en",
     "version": 6,
@@ -791,7 +801,8 @@
         }
       },
       "solicit_answer_details": false,
-      "next_content_id_index": -1
+      "next_content_id_index": -1,
+      "linked_skill_id": null
     },
     "language_code": "en",
     "version": 3,
@@ -866,7 +877,9 @@
         }],
         "solution": {
           "answer_is_exclusive": true,
-          "correct_answer": "",
+          "correct_answer": {
+            "real": 3.0
+          },
           "explanation": {
             "content_id": "solution",
             "html": "<p>The denominator of a fraction is the second number in the fraction. (It counts the total number of pieces in the whole.)</p>\n\n<p>So, for 2/3, the denominator is <strong>3</strong>.</p>"
@@ -895,7 +908,8 @@
         }
       },
       "solicit_answer_details": false,
-      "next_content_id_index": -1
+      "next_content_id_index": -1,
+      "linked_skill_id": null
     },
     "language_code": "en",
     "version": 3,
@@ -1032,7 +1046,8 @@
         }
       },
       "solicit_answer_details": false,
-      "next_content_id_index": -1
+      "next_content_id_index": -1,
+      "linked_skill_id": null
     },
     "language_code": "en",
     "version": 3,
@@ -1107,7 +1122,9 @@
         }],
         "solution": {
           "answer_is_exclusive": true,
-          "correct_answer": "",
+          "correct_answer": {
+            "real": 8.0
+          },
           "explanation": {
             "content_id": "solution",
             "html": "<p>The numerator, which counts the number of pieces in the fraction, is always the <strong>first</strong>&nbsp;number in the fraction. So, for the fraction 8/5, the numerator is <strong>8</strong>.</p>"
@@ -1136,7 +1153,8 @@
         }
       },
       "solicit_answer_details": false,
-      "next_content_id_index": -1
+      "next_content_id_index": -1,
+      "linked_skill_id": null
     },
     "language_code": "en",
     "version": 3,
@@ -1249,7 +1267,8 @@
         }
       },
       "solicit_answer_details": false,
-      "next_content_id_index": -1
+      "next_content_id_index": -1,
+      "linked_skill_id": null
     },
     "language_code": "en",
     "version": 4,
@@ -1378,7 +1397,8 @@
         }
       },
       "solicit_answer_details": false,
-      "next_content_id_index": -1
+      "next_content_id_index": -1,
+      "linked_skill_id": null
     },
     "language_code": "en",
     "version": 4,
@@ -1515,7 +1535,8 @@
         }
       },
       "solicit_answer_details": false,
-      "next_content_id_index": -1
+      "next_content_id_index": -1,
+      "linked_skill_id": null
     },
     "language_code": "en",
     "version": 3,
@@ -1660,7 +1681,8 @@
         }
       },
       "solicit_answer_details": false,
-      "next_content_id_index": -1
+      "next_content_id_index": -1,
+      "linked_skill_id": null
     },
     "language_code": "en",
     "version": 3,
@@ -1751,7 +1773,9 @@
         }],
         "solution": {
           "answer_is_exclusive": false,
-          "correct_answer": "1/4",
+          "correct_answer": {
+            "normalized_string": "1/4"
+          },
           "explanation": {
             "content_id": "solution",
             "html": "<p>A quarter is 1/4th of something</p>"
@@ -1782,7 +1806,8 @@
         }
       },
       "solicit_answer_details": false,
-      "next_content_id_index": -1
+      "next_content_id_index": -1,
+      "linked_skill_id": null
     },
     "language_code": "en",
     "version": 1,
@@ -1872,13 +1897,7 @@
       },
       "written_translations": {
         "translations_mapping": {
-          "content": {
-            "ar": {
-              "data_format": "html",
-              "translation": { "translation": "<p> إذا تحدثنا عن الرغبة في 4/7 من الكعكة ، فماذا يمثل السبعة؟ </p>" },
-              "needs_update": false
-            }
-          },
+          "content": {},
           "solution": {},
           "feedback_1": {},
           "ca_choices_0": {},
@@ -1890,7 +1909,8 @@
         }
       },
       "solicit_answer_details": false,
-      "next_content_id_index": -1
+      "next_content_id_index": -1,
+      "linked_skill_id": null
     },
     "language_code": "en",
     "version": 1,
@@ -1947,7 +1967,9 @@
         }],
         "solution": {
           "answer_is_exclusive": false,
-          "correct_answer": 3.0,
+          "correct_answer": {
+            "normalized_string": "3.0"
+          },
           "explanation": {
             "content_id": "solution",
             "html": "<p>The solution comes out to be 3/4 and the numerator of that is 3.</p>"
@@ -1974,7 +1996,8 @@
         }
       },
       "solicit_answer_details": false,
-      "next_content_id_index": -1
+      "next_content_id_index": -1,
+      "linked_skill_id": null
     },
     "language_code": "en",
     "version": 1,
@@ -2043,7 +2066,9 @@
         }],
         "solution": {
           "answer_is_exclusive": false,
-          "correct_answer": "1/2",
+          "correct_answer": {
+            "normalized_string": "1/2"
+          },
           "explanation": {
             "content_id": "solution",
             "html": "<p>A half is 1/2 of something</p>"
@@ -2070,7 +2095,8 @@
         }
       },
       "solicit_answer_details": false,
-      "next_content_id_index": -1
+      "next_content_id_index": -1,
+      "linked_skill_id": null
     },
     "language_code": "en",
     "version": 1,
@@ -2159,7 +2185,8 @@
         }
       },
       "solicit_answer_details": false,
-      "next_content_id_index": -1
+      "next_content_id_index": -1,
+      "linked_skill_id": null
     },
     "language_code": "en",
     "version": 1,
@@ -2216,7 +2243,9 @@
         }],
         "solution": {
           "answer_is_exclusive": false,
-          "correct_answer": "",
+          "correct_answer": {
+            "real": 5.0
+          },
           "explanation": {
             "content_id": "solution",
             "html": "<p>The solution comes out to be 5/6 and the numerator of that is 5.</p>"
@@ -2243,7 +2272,8 @@
         }
       },
       "solicit_answer_details": false,
-      "next_content_id_index": -1
+      "next_content_id_index": -1,
+      "linked_skill_id": null
     },
     "language_code": "en",
     "version": 1,
diff --git a/domain/src/main/assets/questions.textproto b/domain/src/main/assets/questions.textproto
index b5029a3d58b..b099995f6f9 100644
--- a/domain/src/main/assets/questions.textproto
+++ b/domain/src/main/assets/questions.textproto
@@ -152,14 +152,13 @@ questions {
         }
       }
       solution {
-        interaction_id: "TextInput"
-        correct_answer {
-          correct_answer: "1/4"
-        }
         explanation {
           html: "<p>Removing one of the lines on the right results in a square that is divided into 4 equal pieces:</p>\n<oppia-noninteractive-image alt-with-value=\"&amp;quot;A square divided into four pieces by the diagonals. The left piece is shaded.&amp;quot;\" caption-with-value=\"&amp;quot;&amp;quot;\" filepath-with-value=\"&amp;quot;img_20191031_012904_7vi149rtw5_height_132_width_145.png&amp;quot;\"></oppia-noninteractive-image>\n\n<p>So, the fraction represented by the shaded area is 1/4.</p>"
           content_id: "solution"
         }
+        correct_answer {
+          normalized_string: "1/4"
+        }
       }
       hint {
         hint_content {
@@ -338,14 +337,13 @@ questions {
         }
       }
       solution {
-        interaction_id: "TextInput"
-        correct_answer {
-          correct_answer: "1/4"
-        }
         explanation {
           html: "<p>First, let\'s divide the picture into equal parts:</p>\n<oppia-noninteractive-image alt-with-value=\"&amp;quot;An equilateral triangle divided into 4 equal parts. 1 part is shaded red.&amp;quot;\" caption-with-value=\"&amp;quot;&amp;quot;\" filepath-with-value=\"&amp;quot;img_20191031_011934_xbds5ar8ma_height_130_width_106.png&amp;quot;\"></oppia-noninteractive-image>\n\n<p>There are 4 parts in total, and 1 of them is red, so the fraction is <strong>1/4</strong>.</p>"
           content_id: "solution"
         }
+        correct_answer {
+          normalized_string: "1/4"
+        }
       }
       hint {
         hint_content {
@@ -548,14 +546,13 @@ questions {
         }
       }
       solution {
-        interaction_id: "TextInput"
-        correct_answer {
-          correct_answer: "6/8"
-        }
         explanation {
           html: "<p>You can divide the picture into equal-sized triangles by drawing an extra diagonal line:</p>\n<oppia-noninteractive-image alt-with-value=\"&amp;quot;A square divided into eight equal triangles. Six of the triangles are green.&amp;quot;\" caption-with-value=\"&amp;quot;&amp;quot;\" filepath-with-value=\"&amp;quot;img_20191031_011013_fqn27hl9aq_height_96_width_93.png&amp;quot;\"></oppia-noninteractive-image>\n\n<p>There are 8 parts in total, and 6 of them are green. So, the fraction represented is&nbsp;<strong>6/8</strong>.</p>"
           content_id: "solution"
         }
+        correct_answer {
+          normalized_string: "6/8"
+        }
       }
       hint {
         hint_content {
@@ -1158,12 +1155,14 @@ questions {
         }
       }
       solution {
-        interaction_id: "NumericInput"
         answer_is_exclusive: true
         explanation {
           html: "<p>The denominator of a fraction is the second number in the fraction. (It counts the total number of pieces in the whole.)</p>\n\n<p>So, for 2/3, the denominator is <strong>3</strong>.</p>"
           content_id: "solution"
         }
+        correct_answer {
+          real: 3.0
+        }
       }
       hint {
         hint_content {
@@ -1476,12 +1475,14 @@ questions {
         }
       }
       solution {
-        interaction_id: "NumericInput"
         answer_is_exclusive: true
         explanation {
           html: "<p>The numerator, which counts the number of pieces in the fraction, is always the <strong>first</strong>&nbsp;number in the fraction. So, for the fraction 8/5, the numerator is <strong>8</strong>.</p>"
           content_id: "solution"
         }
+        correct_answer {
+          real: 8.0
+        }
       }
       hint {
         hint_content {
@@ -2314,6 +2315,7 @@ questions {
         }
       }
       answer_groups {
+        tagged_skill_misconception_id: "test_skill_id_1-0"
         outcome {
           feedback {
             html: "<p>Try again!</p>"
@@ -2334,14 +2336,13 @@ questions {
         }
       }
       solution {
-        interaction_id: "TextInput"
-        correct_answer {
-          correct_answer: "1/4"
-        }
         explanation {
           html: "<p>A quarter is 1/4th of something</p>"
           content_id: "solution"
         }
+        correct_answer {
+          normalized_string: "1/4"
+        }
       }
       hint {
         hint_content {
@@ -2633,14 +2634,13 @@ questions {
         }
       }
       solution {
-        interaction_id: "NumericInput"
-        correct_answer: {
-          correct_answer: "3.0"
-        }
         explanation {
           html: "<p>The solution comes out to be 3/4 and the numerator of that is 3.</p>"
           content_id: "solution"
         }
+        correct_answer {
+          normalized_string: "3.0"
+        }
       }
       hint {
         hint_content {
@@ -2740,14 +2740,13 @@ questions {
         }
       }
       solution {
-        interaction_id: "TextInput"
-        correct_answer {
-          correct_answer: "1/2"
-        }
         explanation {
           html: "<p>A half is 1/2 of something</p>"
           content_id: "solution"
         }
+        correct_answer {
+          normalized_string: "1/2"
+        }
       }
       hint {
         hint_content {
@@ -2993,11 +2992,13 @@ questions {
         }
       }
       solution {
-        interaction_id: "NumericInput"
         explanation {
           html: "<p>The solution comes out to be 5/6 and the numerator of that is 5.</p>"
           content_id: "solution"
         }
+        correct_answer {
+          real: 5.0
+        }
       }
       hint {
         hint_content {
diff --git a/domain/src/main/assets/skills.json b/domain/src/main/assets/skills.json
index 0a3afaa5e1f..f432aca77eb 100644
--- a/domain/src/main/assets/skills.json
+++ b/domain/src/main/assets/skills.json
@@ -54,6 +54,11 @@
               "data_format": "html",
               "translation": {"translation" : "أهلا. مرحبا بكم في أوفيا."},
               "needs_update": false
+            },
+            "sw": {
+              "data_format": "html",
+              "translation": {"translation" : "Hello. Karibu katika Oppia."},
+              "needs_update": false
             }
           },
           "test_skill_content_id_1": {
@@ -71,6 +76,11 @@
               "data_format": "html",
               "translation": {"translation" : "هذا هو المثال الأول."},
               "needs_update": false
+            },
+            "sw": {
+              "data_format": "html",
+              "translation": {"translation" : "Huu ni mfano wa kwanza."},
+              "needs_update": false
             }
           },
           "565a49f4-dad4-4a77-bdb0-f4e3b43e7733": {
@@ -119,6 +129,11 @@
               "data_format": "html",
               "translation": {"translation" : "<تمت إزالة>"},
               "needs_update": false
+            },
+            "sw": {
+              "data_format": "html",
+              "translation": {"translation" : "<iliondolewa>"},
+              "needs_update": false
             }
           }
         }
@@ -160,6 +175,11 @@
               "data_format": "html",
               "translation": {"translation" : "Explanation مع <b> Rich Text </b>."},
               "needs_update": false
+            },
+            "sw": {
+              "data_format": "html",
+              "translation": {"translation" : "Maelezo na <b> maandishi tajiri </b>."},
+              "needs_update": false
             }
           },
           "worked_example_1": {
@@ -172,6 +192,11 @@
               "data_format": "html",
               "translation": {"translation" : "مثال عمل مع <I> نص ريتش </I>."},
               "needs_update": false
+            },
+            "sw": {
+              "data_format": "html",
+              "translation": {"translation" : "Mfano uliotumika na <i>maandishi tajiri</i>."},
+              "needs_update": false
             }
           },
           "99b6bb52-7e4a-4b70-b0ec-a3b25a4c1c5c": {
@@ -220,6 +245,11 @@
               "data_format": "html",
               "translation": {"translation" : "<تمت إزالة>"},
               "needs_update": false
+            },
+            "sw": {
+              "data_format": "html",
+              "translation": {"translation" : "<iliondolewa>"},
+              "needs_update": false
             }
           }
         }
@@ -270,6 +300,11 @@
               "data_format": "html",
               "translation": {"translation" : "تفسير دون نص غني."},
               "needs_update": false
+            },
+            "sw": {
+              "data_format": "html",
+              "translation": {"translation" : "Maelezo bila maandishi tajiri."},
+              "needs_update": false
             }
           },
           "worked_example_1": {
@@ -282,6 +317,11 @@
               "data_format": "html",
               "translation": {"translation" : "مثال على ذلك دون نص غني."},
               "needs_update": false
+            },
+            "sw": {
+              "data_format": "html",
+              "translation": {"translation" : "Mfano uliofanya kazi bila maandishi tajiri."},
+              "needs_update": false
             }
           },
           "8bb0b74e-5c73-4569-a548-e7460640b280": {
@@ -318,6 +358,11 @@
               "data_format": "html",
               "translation": {"translation" : "مثال يعمل الثاني."},
               "needs_update": false
+            },
+            "sw": {
+              "data_format": "html",
+              "translation": {"translation" : "Mfano wa pili uliofanya kazi."},
+              "needs_update": false
             }
           },
           "76a61e5f-205a-4950-9ce5-483304a36320": {
@@ -378,6 +423,11 @@
               "data_format": "html",
               "translation": {"translation" : "<تمت إزالة>"},
               "needs_update": false
+            },
+            "sw": {
+              "data_format": "html",
+              "translation": {"translation" : "<iliondolewa>"},
+              "needs_update": false
             }
           },
           "question-related-to-worked_example_2": {
@@ -390,6 +440,11 @@
               "data_format": "html",
               "translation": {"translation" : "<تمت إزالة>"},
               "needs_update": false
+            },
+            "sw": {
+              "data_format": "html",
+              "translation": {"translation" : "<iliondolewa>"},
+              "needs_update": false
             }
           }
         }
@@ -522,4 +577,4 @@
       }
     }
   }]
-}
\ No newline at end of file
+}
diff --git a/domain/src/main/assets/skills.textproto b/domain/src/main/assets/skills.textproto
index afef5957961..997aa4b0238 100644
--- a/domain/src/main/assets/skills.textproto
+++ b/domain/src/main/assets/skills.textproto
@@ -54,6 +54,12 @@ concept_cards {
           html: "\330\243\331\207\331\204\330\247. \331\205\330\261\330\255\330\250\330\247 \330\250\331\203\331\205 \331\201\331\212 \330\243\331\210\331\201\331\212\330\247."
         }
       }
+      translation_mapping {
+        key: "sw"
+        value {
+          html: "Hello. Karibu katika Oppia."
+        }
+      }
     }
   }
   written_translation {
@@ -77,6 +83,12 @@ concept_cards {
           html: "\331\207\330\260\330\247 \331\207\331\210 \330\247\331\204\331\205\330\253\330\247\331\204 \330\247\331\204\330\243\331\210\331\204."
         }
       }
+      translation_mapping {
+        key: "sw"
+        value {
+          html: "Huu ni mfano wa kwanza."
+        }
+      }
     }
   }
   written_translation {
@@ -145,6 +157,12 @@ concept_cards {
           html: "<\330\252\331\205\330\252 \330\245\330\262\330\247\331\204\330\251>"
         }
       }
+      translation_mapping {
+        key: "sw"
+        value {
+          html: "<iliondolewa>"
+        }
+      }
     }
   }
 }
@@ -184,6 +202,12 @@ concept_cards {
           html: "Explanation \331\205\330\271 <b> Rich Text </b>."
         }
       }
+      translation_mapping {
+        key: "sw"
+        value {
+          html: "Maelezo na <b> maandishi tajiri </b>."
+        }
+      }
     }
   }
   written_translation {
@@ -201,6 +225,12 @@ concept_cards {
           html: "\331\205\330\253\330\247\331\204 \330\271\331\205\331\204 \331\205\330\271 <I> \331\206\330\265 \330\261\331\212\330\252\330\264 </I>."
         }
       }
+      translation_mapping {
+        key: "sw"
+        value {
+          html: "Mfano uliotumika na <i>maandishi tajiri</i>."
+        }
+      }
     }
   }
   written_translation {
@@ -269,6 +299,12 @@ concept_cards {
           html: "<\330\252\331\205\330\252 \330\245\330\262\330\247\331\204\330\251>"
         }
       }
+      translation_mapping {
+        key: "sw"
+        value {
+          html: "<iliondolewa>"
+        }
+      }
     }
   }
 }
@@ -312,6 +348,12 @@ concept_cards {
           html: "\330\252\331\201\330\263\331\212\330\261 \330\257\331\210\331\206 \331\206\330\265 \330\272\331\206\331\212."
         }
       }
+      translation_mapping {
+        key: "sw"
+        value {
+          html: "Maelezo bila maandishi tajiri."
+        }
+      }
     }
   }
   written_translation {
@@ -329,6 +371,12 @@ concept_cards {
           html: "\331\205\330\253\330\247\331\204 \330\271\331\204\331\211 \330\260\331\204\331\203 \330\257\331\210\331\206 \331\206\330\265 \330\272\331\206\331\212."
         }
       }
+      translation_mapping {
+        key: "sw"
+        value {
+          html: "Mfano uliofanya kazi bila maandishi tajiri."
+        }
+      }
     }
   }
   written_translation {
@@ -380,6 +428,12 @@ concept_cards {
           html: "\331\205\330\253\330\247\331\204 \331\212\330\271\331\205\331\204 \330\247\331\204\330\253\330\247\331\206\331\212."
         }
       }
+      translation_mapping {
+        key: "sw"
+        value {
+          html: "Mfano wa pili uliofanya kazi."
+        }
+      }
     }
   }
   written_translation {
@@ -465,6 +519,12 @@ concept_cards {
           html: "<\330\252\331\205\330\252 \330\245\330\262\330\247\331\204\330\251>"
         }
       }
+      translation_mapping {
+        key: "sw"
+        value {
+          html: "<iliondolewa>"
+        }
+      }
     }
   }
   written_translation {
@@ -482,6 +542,12 @@ concept_cards {
           html: "<\330\252\331\205\330\252 \330\245\330\262\330\247\331\204\330\251>"
         }
       }
+      translation_mapping {
+        key: "sw"
+        value {
+          html: "<iliondolewa>"
+        }
+      }
     }
   }
 }
@@ -622,4 +688,4 @@ concept_cards {
     value {
     }
   }
-}
\ No newline at end of file
+}
diff --git a/domain/src/main/assets/tIoSb3HZFN6e.json b/domain/src/main/assets/tIoSb3HZFN6e.json
index c9c17dc478d..7df4b1abf48 100644
--- a/domain/src/main/assets/tIoSb3HZFN6e.json
+++ b/domain/src/main/assets/tIoSb3HZFN6e.json
@@ -220,7 +220,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 3": {
         "content": {
@@ -393,7 +394,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 2": {
         "content": {
@@ -519,7 +521,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 5": {
         "content": {
@@ -659,7 +662,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 4": {
         "content": {
@@ -902,7 +906,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "The simplest form": {
         "content": {
@@ -987,7 +992,9 @@
           }],
           "solution": {
             "answer_is_exclusive": false,
-            "correct_answer": "1:2",
+            "correct_answer": {
+              "normalized_string": "1:2"
+            },
             "explanation": {
               "content_id": "solution",
               "html": "<p>A common factor of 4 and 8 is 2. So, we can divide both sides of the ratio 4:8 by 2 to get 2:4.</p>\n\n<p>But this is not the simplest form yet, because 2 and 4 are both divisible by 2. So, we can divide both sides of the ratio 2:4 by 2 to get 1:2.</p>\n\n<p>We can't simplify this ratio any more, so <strong>1:2</strong> is the correct answer.</p>"
@@ -1058,7 +1065,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Introduction": {
         "content": {
@@ -1109,7 +1117,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "James makes his own recipe": {
         "content": {
@@ -1160,7 +1169,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Final Test": {
         "content": {
@@ -1297,7 +1307,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "dividing all three sides": {
         "content": {
@@ -1348,7 +1359,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "2 to 4 is 3 to 6": {
         "content": {
@@ -1530,7 +1542,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Simplest form of the simplest form": {
         "content": {
@@ -1656,7 +1669,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "3.5": {
         "content": {
@@ -1813,7 +1827,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Cliffhanger and Congratulations": {
         "content": {
@@ -1852,7 +1867,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Review 2": {
         "content": {
@@ -2000,7 +2016,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Review 3": {
         "content": {
@@ -2188,7 +2205,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Mom comes home": {
         "content": {
@@ -2239,7 +2257,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Happy ending": {
         "content": {
@@ -2290,7 +2309,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 6": {
         "content": {
@@ -2422,7 +2442,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Checking equivalent ratio using the simplest form": {
         "content": {
@@ -2534,7 +2555,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Review 1": {
         "content": {
@@ -2671,7 +2693,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       }
     },
     "objective": "Learn how to reduce ratios to simplest form, and use that to check if two ratios are equivalent.",
diff --git a/domain/src/main/assets/tIoSb3HZFN6e.textproto b/domain/src/main/assets/tIoSb3HZFN6e.textproto
index 98223bdbd33..6ea109dab86 100644
--- a/domain/src/main/assets/tIoSb3HZFN6e.textproto
+++ b/domain/src/main/assets/tIoSb3HZFN6e.textproto
@@ -1358,14 +1358,13 @@ states {
         }
       }
       solution {
-        interaction_id: "TextInput"
-        correct_answer {
-          correct_answer: "1:2"
-        }
         explanation {
           html: "<p>A common factor of 4\302\240and 8\302\240is 2. So, we can divide both sides of the ratio 4:8\302\240by 2 to get 2:4.</p>\n\n<p>But this is not the simplest form yet, because 2 and 4 are both\302\240divisible by 2. So, we can divide both sides of the ratio 2:4 by 2 to get 1:2.</p>\n\n<p>We can\'t simplify this ratio any more, so <strong>1:2</strong> is the correct answer.</p>"
           content_id: "solution"
         }
+        correct_answer {
+          normalized_string: "1:2"
+        }
       }
       hint {
         hint_content {
diff --git a/domain/src/main/assets/test_checkpointing_base_exploration.textproto b/domain/src/main/assets/test_checkpointing_base_exploration.textproto
index e9b3e1ece98..388553d871a 100644
--- a/domain/src/main/assets/test_checkpointing_base_exploration.textproto
+++ b/domain/src/main/assets/test_checkpointing_base_exploration.textproto
@@ -47,7 +47,6 @@ states {
         }
       }
       solution {
-        interaction_id: "NumericInput"
         explanation {
         }
       }
diff --git a/domain/src/main/assets/test_checkpointing_exploration_multiple_compatible_updates.textproto b/domain/src/main/assets/test_checkpointing_exploration_multiple_compatible_updates.textproto
index 9c973955d5b..e174cbe449e 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_multiple_compatible_updates.textproto
+++ b/domain/src/main/assets/test_checkpointing_exploration_multiple_compatible_updates.textproto
@@ -47,7 +47,6 @@ states {
         }
       }
       solution {
-        interaction_id: "NumericInput"
         explanation {
         }
       }
diff --git a/domain/src/main/assets/test_checkpointing_exploration_multiple_updates_one_incompatible.textproto b/domain/src/main/assets/test_checkpointing_exploration_multiple_updates_one_incompatible.textproto
index f846a080758..0ba22cdb68c 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_multiple_updates_one_incompatible.textproto
+++ b/domain/src/main/assets/test_checkpointing_exploration_multiple_updates_one_incompatible.textproto
@@ -56,7 +56,6 @@ states {
         }
       }
       solution {
-        interaction_id: "NumericInput"
         explanation {
         }
       }
diff --git a/domain/src/main/assets/test_checkpointing_exploration_new_title.textproto b/domain/src/main/assets/test_checkpointing_exploration_new_title.textproto
index b2d62c89d1e..c63330b1bed 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_new_title.textproto
+++ b/domain/src/main/assets/test_checkpointing_exploration_new_title.textproto
@@ -47,7 +47,6 @@ states {
         }
       }
       solution {
-        interaction_id: "NumericInput"
         explanation {
         }
       }
diff --git a/domain/src/main/assets/test_checkpointing_exploration_new_version.textproto b/domain/src/main/assets/test_checkpointing_exploration_new_version.textproto
index 0ed47cba188..e3468ba0f3a 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_new_version.textproto
+++ b/domain/src/main/assets/test_checkpointing_exploration_new_version.textproto
@@ -47,7 +47,6 @@ states {
         }
       }
       solution {
-        interaction_id: "NumericInput"
         explanation {
         }
       }
diff --git a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_compat_rule_spec.textproto b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_compat_rule_spec.textproto
index f8b665b6d9d..c372ac9d1eb 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_compat_rule_spec.textproto
+++ b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_compat_rule_spec.textproto
@@ -53,7 +53,6 @@ states {
         }
       }
       solution {
-        interaction_id: "NumericInput"
         explanation {
         }
       }
diff --git a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_correctness_label.textproto b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_correctness_label.textproto
index e7686745589..bb8f4b675af 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_correctness_label.textproto
+++ b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_correctness_label.textproto
@@ -46,7 +46,6 @@ states {
         }
       }
       solution {
-        interaction_id: "NumericInput"
         explanation {
         }
       }
diff --git a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_destination.textproto b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_destination.textproto
index 91ef1a0ac5b..e4a1b9b8770 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_destination.textproto
+++ b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_destination.textproto
@@ -47,7 +47,6 @@ states {
         }
       }
       solution {
-        interaction_id: "NumericInput"
         explanation {
         }
       }
diff --git a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_feedback_html.textproto b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_feedback_html.textproto
index 1e1827753bb..f165aebb4da 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_feedback_html.textproto
+++ b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_feedback_html.textproto
@@ -47,7 +47,6 @@ states {
         }
       }
       solution {
-        interaction_id: "NumericInput"
         explanation {
         }
       }
diff --git a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_feedback_id.textproto b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_feedback_id.textproto
index 678fa823562..bc646719bdd 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_feedback_id.textproto
+++ b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_feedback_id.textproto
@@ -47,7 +47,6 @@ states {
         }
       }
       solution {
-        interaction_id: "NumericInput"
         explanation {
         }
       }
diff --git a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_incompat_rule_spec.textproto b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_incompat_rule_spec.textproto
index 6d45f880157..2d577e632db 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_incompat_rule_spec.textproto
+++ b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_incompat_rule_spec.textproto
@@ -53,7 +53,6 @@ states {
         }
       }
       solution {
-        interaction_id: "NumericInput"
         explanation {
         }
       }
diff --git a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_interaction.textproto b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_interaction.textproto
index 2df0d2135ae..c6862bf881a 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_interaction.textproto
+++ b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_interaction.textproto
@@ -10,9 +10,8 @@ states {
     interaction {
       id: "TextInput"
       solution {
-        interaction_id: "TextInput"
         correct_answer {
-          correct_answer: "3.14"
+          normalized_string: "3.14"
         }
         explanation {
         }
diff --git a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_new_correct_answer.textproto b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_new_correct_answer.textproto
index 87545d363dc..8bd110938c6 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_new_correct_answer.textproto
+++ b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_new_correct_answer.textproto
@@ -56,7 +56,6 @@ states {
         }
       }
       solution {
-        interaction_id: "NumericInput"
         explanation {
         }
       }
diff --git a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_updated_hints.textproto b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_updated_hints.textproto
index bea9b76ecde..60f7bb230d7 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_updated_hints.textproto
+++ b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_updated_hints.textproto
@@ -47,7 +47,6 @@ states {
         }
       }
       solution {
-        interaction_id: "NumericInput"
         explanation {
         }
       }
diff --git a/domain/src/main/assets/test_checkpointing_exploration_updated_second_state_removed.textproto b/domain/src/main/assets/test_checkpointing_exploration_updated_second_state_removed.textproto
index 03ad66160df..55ee7552f17 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_updated_second_state_removed.textproto
+++ b/domain/src/main/assets/test_checkpointing_exploration_updated_second_state_removed.textproto
@@ -47,7 +47,6 @@ states {
         }
       }
       solution {
-        interaction_id: "NumericInput"
         explanation {
         }
       }
diff --git a/domain/src/main/assets/test_exp_id_2.json b/domain/src/main/assets/test_exp_id_2.json
index 87a18743954..494f1937677 100644
--- a/domain/src/main/assets/test_exp_id_2.json
+++ b/domain/src/main/assets/test_exp_id_2.json
@@ -528,12 +528,14 @@
             }
           }],
           "solution": {
-            "answer_is_exclusive": false,
+            "answer_is_exclusive": true,
             "correct_answer": {
-              "isNegative": false,
-              "wholeNumber": 0,
-              "numerator": 1,
-              "denominator": 2
+              "fraction": {
+                "isNegative": false,
+                "wholeNumber": 0,
+                "numerator": 1,
+                "denominator": 2
+              }
             },
             "explanation": {
               "content_id": "solution",
@@ -823,8 +825,10 @@
             }
           }],
           "solution": {
-            "answer_is_exclusive": false,
-            "correct_answer": "",
+            "answer_is_exclusive": true,
+            "correct_answer": {
+              "real": 121.0
+            },
             "explanation": {
               "content_id": "solution",
               "html": "<p>11 times 11 is 121.</p>"
@@ -1058,8 +1062,22 @@
             "refresher_exploration_id": "",
             "missing_prerequisite_skill_id": ""
           },
-          "hints": [],
-          "solution": null
+          "hints": [{
+            "hint_content": {
+              "content_id": "hint_1",
+              "html": "<p>If you first set it up as a series of equations, it may be easier to solve: A = 1.2x, B = 1.5x, ratio = A/B = ?</p>"
+            }
+          }],
+          "solution": {
+            "answer_is_exclusive": false,
+            "correct_answer": {
+              "ratio_expression": [4, 5]
+            },
+            "explanation": {
+              "content_id": "solution",
+              "html": "<p>A = 1.2x, B = 1.5x, ratio = A/B = (1.2x)/(1.5x) = 1.2/1.5 = 12/15 = 4/5 -> 4:5.</p>"
+            }
+          }
         },
         "classifier_model_id": "",
         "recorded_voiceovers": {
@@ -1174,6 +1192,40 @@
                 "translation": {"translation" : "Ingiza katika umbizo la x:y"},
                 "needs_update": false
               }
+            },
+            "hint_1": {
+              "pt": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Se você o configurou pela primeira vez como uma série de equações, pode ser mais fácil resolver: a = 1,2x, b = 1,5x, razão = a/b =? </p>"},
+                "needs_update": false
+              },
+              "ar": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> إذا قمت بإعدادها لأول مرة كسلسلة من المعادلات ، فقد يكون من الأسهل حل: a = 1.2x ، b = 1.5x ، ratio = a/b =؟ </p>"},
+                "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> Ikiwa utaiweka kwanza kama safu ya hesabu, inaweza kuwa rahisi kusuluhisha: a = 1.2x, b = 1.5x, uwiano = a/b =? </p>"},
+                "needs_update": false
+              }
+            },
+            "solution": {
+              "pt": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> a = 1,2x, b = 1,5x, razão = a/b = (1,2x)/(1,5x) = 1.2/1.5 = 12/15 = 4/5 -> 4: 5. </p>"},
+                "needs_update": false
+              },
+              "ar": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> a = 1.2x ، b = 1.5x ، نسبة = a/b = (1.2x)/(1.5x) = 1.2/1.5 = 12/15 = 4/5 -> 4: 5. </p>"},
+                "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "<p> a = 1.2x, b = 1.5x, uwiano = a/b = (1.2x)/(1.5x) = 1.2/1.5 = 12/15 = 4/5 -> 4: 5. </p>"},
+                "needs_update": false
+              }
             }
           }
         },
@@ -1234,8 +1286,22 @@
             "refresher_exploration_id": "",
             "missing_prerequisite_skill_id": ""
           },
-          "hints": [],
-          "solution": null
+          "hints": [{
+            "hint_content": {
+              "content_id": "hint_1",
+              "html": "The country is near Norway."
+            }
+          }],
+          "solution": {
+            "answer_is_exclusive": true,
+            "correct_answer": {
+              "normalized_string": "finnish"
+            },
+            "explanation": {
+              "content_id": "solution",
+              "html": "The answer is 'finnish'."
+            }
+          }
         },
         "classifier_model_id": "",
         "recorded_voiceovers": {
@@ -1331,6 +1397,40 @@
                 "translation": {"translations" : ["Kifini"]},
                 "needs_update": false
               }
+            },
+            "hint_1": {
+              "ar": {
+                "data_format": "html",
+                "translation": {"translation" : "البلد بالقرب من النرويج."},
+                "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "Nchi iko karibu na Norway."},
+                "needs_update": false
+              },
+              "pt": {
+                "data_format": "html",
+                "translation": {"translation" : "O país está perto da Noruega."},
+                "needs_update": false
+              }
+            },
+            "solution": {
+              "ar": {
+                "data_format": "html",
+                "translation": {"translation" : "الجواب هو \"الفنلندي\"."},
+                "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "Jibu ni 'Kifini'."},
+                "needs_update": false
+              },
+              "pt": {
+                "data_format": "html",
+                "translation": {"translation" : "A resposta é 'finlandesa'."},
+                "needs_update": false
+              }
             }
           }
         },
diff --git a/domain/src/main/assets/test_exp_id_2.textproto b/domain/src/main/assets/test_exp_id_2.textproto
index f063ac38089..1fc383fbf27 100644
--- a/domain/src/main/assets/test_exp_id_2.textproto
+++ b/domain/src/main/assets/test_exp_id_2.textproto
@@ -808,15 +808,17 @@ states {
         }
       }
       solution {
-        interaction_id: "FractionInput"
-        correct_answer {
-          denominator: 2
-          numerator: 1
-        }
+        answer_is_exclusive: true
         explanation {
           html: "<p>Half of something has one part in the numerator for every two parts in the denominator.</p><p>Click on this <oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;test_skill_id_1&amp;quot;\" text-with-value=\"&amp;quot;test_skill_id_1 concept card&amp;quot;\"></oppia-noninteractive-skillreview>.</p>"
           content_id: "solution"
         }
+        correct_answer {
+          fraction {
+            numerator: 1
+            denominator: 2
+          }
+        }
       }
       hint {
         hint_content {
@@ -1210,11 +1212,14 @@ states {
         }
       }
       solution {
-        interaction_id: "NumericInput"
+        answer_is_exclusive: true
         explanation {
           html: "<p>11 times 11 is 121.</p>"
           content_id: "solution"
         }
+        correct_answer {
+          real: 121.0
+        }
       }
       hint {
         hint_content {
@@ -1404,6 +1409,52 @@ states {
         }
       }
     }
+    written_translations {
+      key: "hint_1"
+      value {
+        translation_mapping {
+          key: "pt"
+          value {
+            html: "<p> Se voc\303\252 o configurou pela primeira vez como uma s\303\251rie de equa\303\247\303\265es, pode ser mais f\303\241cil resolver: a = 1,2x, b = 1,5x, raz\303\243o = a/b =? </p>"
+          }
+        }
+        translation_mapping {
+          key: "ar"
+          value {
+            html: "<p> \330\245\330\260\330\247 \331\202\331\205\330\252 \330\250\330\245\330\271\330\257\330\247\330\257\331\207\330\247 \331\204\330\243\331\210\331\204 \331\205\330\261\330\251 \331\203\330\263\331\204\330\263\331\204\330\251 \331\205\331\206 \330\247\331\204\331\205\330\271\330\247\330\257\331\204\330\247\330\252 \330\214 \331\201\331\202\330\257 \331\212\331\203\331\210\331\206 \331\205\331\206 \330\247\331\204\330\243\330\263\331\207\331\204 \330\255\331\204: a = 1.2x \330\214 b = 1.5x \330\214 ratio = a/b =\330\237 </p>"
+          }
+        }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> Ikiwa utaiweka kwanza kama safu ya hesabu, inaweza kuwa rahisi kusuluhisha: a = 1.2x, b = 1.5x, uwiano = a/b =? </p>"
+          }
+        }
+      }
+    }
+    written_translations {
+      key: "solution"
+      value {
+        translation_mapping {
+          key: "pt"
+          value {
+            html: "<p> a = 1,2x, b = 1,5x, raz\303\243o = a/b = (1,2x)/(1,5x) = 1.2/1.5 = 12/15 = 4/5 -> 4: 5. </p>"
+          }
+        }
+        translation_mapping {
+          key: "ar"
+          value {
+            html: "<p> a = 1.2x \330\214 b = 1.5x \330\214 \331\206\330\263\330\250\330\251 = a/b = (1.2x)/(1.5x) = 1.2/1.5 = 12/15 = 4/5 -> 4: 5. </p>"
+          }
+        }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "<p> a = 1.2x, b = 1.5x, uwiano = a/b = (1.2x)/(1.5x) = 1.2/1.5 = 12/15 = 4/5 -> 4: 5. </p>"
+          }
+        }
+      }
+    }
     interaction {
       id: "RatioExpressionInput"
       answer_groups {
@@ -1468,6 +1519,24 @@ states {
           rule_type: "IsEquivalent"
         }
       }
+      solution {
+        explanation {
+          html: "<p>A = 1.2x, B = 1.5x, ratio = A/B = (1.2x)/(1.5x) = 1.2/1.5 = 12/15 = 4/5 -> 4:5.</p>"
+          content_id: "solution"
+        }
+        correct_answer {
+          ratio_expression {
+            ratio_component: 4
+            ratio_component: 5
+          }
+        }
+      }
+      hint {
+        hint_content {
+          html: "<p>If you first set it up as a series of equations, it may be easier to solve: A = 1.2x, B = 1.5x, ratio = A/B = ?</p>"
+          content_id: "hint_1"
+        }
+      }
       default_outcome {
         dest_state_name: "RatioInput"
         feedback {
@@ -1640,6 +1709,52 @@ states {
         }
       }
     }
+    written_translations {
+      key: "hint_1"
+      value {
+        translation_mapping {
+          key: "ar"
+          value {
+            html: "\330\247\331\204\330\250\331\204\330\257 \330\250\330\247\331\204\331\202\330\261\330\250 \331\205\331\206 \330\247\331\204\331\206\330\261\331\210\331\212\330\254."
+          }
+        }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "Nchi iko karibu na Norway."
+          }
+        }
+        translation_mapping {
+          key: "pt"
+          value {
+            html: "O pa\303\255s est\303\241 perto da Noruega."
+          }
+        }
+      }
+    }
+    written_translations {
+      key: "solution"
+      value {
+        translation_mapping {
+          key: "ar"
+          value {
+            html: "\330\247\331\204\330\254\331\210\330\247\330\250 \331\207\331\210 \"\330\247\331\204\331\201\331\206\331\204\331\206\330\257\331\212\"."
+          }
+        }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "Jibu ni \'Kifini\'."
+          }
+        }
+        translation_mapping {
+          key: "pt"
+          value {
+            html: "A resposta \303\251 \'finlandesa\'."
+          }
+        }
+      }
+    }
     interaction {
       id: "TextInput"
       answer_groups {
@@ -1664,6 +1779,22 @@ states {
           rule_type: "Equals"
         }
       }
+      solution {
+        answer_is_exclusive: true
+        explanation {
+          html: "The answer is \'finnish\'."
+          content_id: "solution"
+        }
+        correct_answer {
+          normalized_string: "finnish"
+        }
+      }
+      hint {
+        hint_content {
+          html: "The country is near Norway."
+          content_id: "hint_1"
+        }
+      }
       default_outcome {
         dest_state_name: "Text"
         feedback {
diff --git a/domain/src/main/assets/test_exp_id_4.json b/domain/src/main/assets/test_exp_id_4.json
index 7b0de424ff8..07e2913e9e7 100644
--- a/domain/src/main/assets/test_exp_id_4.json
+++ b/domain/src/main/assets/test_exp_id_4.json
@@ -39,7 +39,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "DragDropSortInput": {
         "content": {
@@ -184,7 +185,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       }
     },
     "objective": "learn how to arrange the sentence",
diff --git a/domain/src/main/assets/test_exp_id_5.json b/domain/src/main/assets/test_exp_id_5.json
index 79795a7c2b3..ba8a12c5918 100644
--- a/domain/src/main/assets/test_exp_id_5.json
+++ b/domain/src/main/assets/test_exp_id_5.json
@@ -60,7 +60,16 @@
             "missing_prerequisite_skill_id": ""
           },
           "hints": [],
-          "solution": null
+          "solution": {
+            "answer_is_exclusive": false,
+            "correct_answer": {
+              "math_expression": "1 + 2"
+            },
+            "explanation": {
+              "content_id": "solution",
+              "html": "The answer is 1 + 2."
+            }
+          }
         },
         "classifier_model_id": "",
         "recorded_voiceovers": {
@@ -139,6 +148,23 @@
                 "translation": {"translation" : "Ingiza usemi wa nambari."},
                 "needs_update": false
               }
+            },
+            "solution": {
+              "pt": {
+                "data_format": "html",
+                "translation": {"translation" : "A resposta é 1 + 2."},
+                "needs_update": false
+              },
+              "ar": {
+                "data_format": "html",
+                "translation": {"translation" : "الجواب هو 1 + 2."},
+                "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "Jibu ni 1 + 2."},
+                "needs_update": false
+              }
             }
           }
         },
@@ -187,7 +213,16 @@
             "missing_prerequisite_skill_id": ""
           },
           "hints": [],
-          "solution": null
+          "solution": {
+            "answer_is_exclusive": false,
+            "correct_answer": {
+              "math_expression": "1 + 2"
+            },
+            "explanation": {
+              "content_id": "solution",
+              "html": "The answer is 1 + 2."
+            }
+          }
         },
         "classifier_model_id": "",
         "recorded_voiceovers": {
@@ -249,6 +284,23 @@
                 "translation": {"translation" : "<p> Jibu hilo sio sahihi. Jaribu tena. </p>"},
                 "needs_update": false
               }
+            },
+            "solution": {
+              "pt": {
+                "data_format": "html",
+                "translation": {"translation" : "A resposta é 1 + 2."},
+                "needs_update": false
+              },
+              "ar": {
+                "data_format": "html",
+                "translation": {"translation" : "الجواب هو 1 + 2."},
+                "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "Jibu ni 1 + 2."},
+                "needs_update": false
+              }
             }
           }
         },
@@ -297,7 +349,16 @@
             "missing_prerequisite_skill_id": ""
           },
           "hints": [],
-          "solution": null
+          "solution": {
+            "answer_is_exclusive": false,
+            "correct_answer": {
+              "math_expression": "1 + 2"
+            },
+            "explanation": {
+              "content_id": "solution",
+              "html": "The answer is 1 + 2."
+            }
+          }
         },
         "classifier_model_id": "",
         "recorded_voiceovers": {
@@ -359,6 +420,23 @@
                 "translation": {"translation" : "<p> Jibu hilo sio sahihi. Jaribu tena. </p>"},
                 "needs_update": false
               }
+            },
+            "solution": {
+              "pt": {
+                "data_format": "html",
+                "translation": {"translation" : "A resposta é 1 + 2."},
+                "needs_update": false
+              },
+              "ar": {
+                "data_format": "html",
+                "translation": {"translation" : "الجواب هو 1 + 2."},
+                "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "Jibu ni 1 + 2."},
+                "needs_update": false
+              }
             }
           }
         },
@@ -414,7 +492,16 @@
             "missing_prerequisite_skill_id": ""
           },
           "hints": [],
-          "solution": null
+          "solution": {
+            "answer_is_exclusive": false,
+            "correct_answer": {
+              "math_expression": "x^2 - x - 2"
+            },
+            "explanation": {
+              "content_id": "solution",
+              "html": "The answer is x^2 - x - 2."
+            }
+          }
         },
         "classifier_model_id": "",
         "recorded_voiceovers": {
@@ -476,6 +563,23 @@
                 "translation": {"translation" : "<p> Jibu hilo sio sahihi. Jaribu tena. </p>"},
                 "needs_update": false
               }
+            },
+            "solution": {
+              "pt": {
+                "data_format": "html",
+                "translation": {"translation" : "A resposta é x^2 - x - 2."},
+                "needs_update": false
+              },
+              "ar": {
+                "data_format": "html",
+                "translation": {"translation" : "الجواب هو x^2 - x - 2."},
+                "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "Jibu ni x^2 - x - 2."},
+                "needs_update": false
+              }
             }
           }
         },
@@ -528,7 +632,16 @@
             "missing_prerequisite_skill_id": ""
           },
           "hints": [],
-          "solution": null
+          "solution": {
+            "answer_is_exclusive": false,
+            "correct_answer": {
+              "math_expression": "x^2 - x - 2"
+            },
+            "explanation": {
+              "content_id": "solution",
+              "html": "The answer is x^2 - x - 2."
+            }
+          }
         },
         "classifier_model_id": "",
         "recorded_voiceovers": {
@@ -590,6 +703,23 @@
                 "translation": {"translation" : "<p>Jibu hilo si sahihi. Jaribu tena.</p>"},
                 "needs_update": false
               }
+            },
+            "solution": {
+              "pt": {
+                "data_format": "html",
+                "translation": {"translation" : "A resposta é x^2 - x - 2."},
+                "needs_update": false
+              },
+              "ar": {
+                "data_format": "html",
+                "translation": {"translation" : "الجواب هو x^2 - x - 2."},
+                "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "Jibu ni x^2 - x - 2."},
+                "needs_update": false
+              }
             }
           }
         },
@@ -642,7 +772,16 @@
             "missing_prerequisite_skill_id": ""
           },
           "hints": [],
-          "solution": null
+          "solution": {
+            "answer_is_exclusive": false,
+            "correct_answer": {
+              "math_expression": "x^2 - x - 2"
+            },
+            "explanation": {
+              "content_id": "solution",
+              "html": "The answer is x^2 - x - 2."
+            }
+          }
         },
         "classifier_model_id": "",
         "recorded_voiceovers": {
@@ -704,6 +843,23 @@
                 "translation": {"translation" : "<p> Jibu hilo sio sahihi. Jaribu tena. </p>"},
                 "needs_update": false
               }
+            },
+            "solution": {
+              "pt": {
+                "data_format": "html",
+                "translation": {"translation" : "A resposta é x^2 - x - 2."},
+                "needs_update": false
+              },
+              "ar": {
+                "data_format": "html",
+                "translation": {"translation" : "الجواب هو x^2 - x - 2."},
+                "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "Jibu ni x^2 - x - 2."},
+                "needs_update": false
+              }
             }
           }
         },
@@ -759,7 +915,16 @@
             "missing_prerequisite_skill_id": ""
           },
           "hints": [],
-          "solution": null
+          "solution": {
+            "answer_is_exclusive": false,
+            "correct_answer": {
+              "math_expression": "2y = x^2 - x - 2"
+            },
+            "explanation": {
+              "content_id": "solution",
+              "html": "The answer is 2y = x^2 - x - 2."
+            }
+          }
         },
         "classifier_model_id": "",
         "recorded_voiceovers": {
@@ -821,6 +986,23 @@
                 "translation": {"translation" : "<p> Jibu hilo sio sahihi. Jaribu tena. </p>"},
                 "needs_update": false
               }
+            },
+            "solution": {
+              "pt": {
+                "data_format": "html",
+                "translation": {"translation" : "A resposta é 2y = x^2 - x - 2."},
+                "needs_update": false
+              },
+              "ar": {
+                "data_format": "html",
+                "translation": {"translation" : "الجواب هو 2y = x^2 - x - 2."},
+                "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "Jibu ni 2y = x^2 - x - 2."},
+                "needs_update": false
+              }
             }
           }
         },
@@ -873,7 +1055,16 @@
             "missing_prerequisite_skill_id": ""
           },
           "hints": [],
-          "solution": null
+          "solution": {
+            "answer_is_exclusive": false,
+            "correct_answer": {
+              "math_expression": "2y = x^2 - x - 2"
+            },
+            "explanation": {
+              "content_id": "solution",
+              "html": "The answer is 2y = x^2 - x - 2."
+            }
+          }
         },
         "classifier_model_id": "",
         "recorded_voiceovers": {
@@ -935,6 +1126,23 @@
                 "translation": {"translation" : "<p> Jibu hilo sio sahihi. Jaribu tena. </p>"},
                 "needs_update": false
               }
+            },
+            "solution": {
+              "pt": {
+                "data_format": "html",
+                "translation": {"translation" : "A resposta é 2y = x^2 - x - 2."},
+                "needs_update": false
+              },
+              "ar": {
+                "data_format": "html",
+                "translation": {"translation" : "الجواب هو 2y = x^2 - x - 2."},
+                "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "Jibu ni 2y = x^2 - x - 2."},
+                "needs_update": false
+              }
             }
           }
         },
@@ -987,7 +1195,16 @@
             "missing_prerequisite_skill_id": ""
           },
           "hints": [],
-          "solution": null
+          "solution": {
+            "answer_is_exclusive": false,
+            "correct_answer": {
+              "math_expression": "2y = x^2 - x - 2"
+            },
+            "explanation": {
+              "content_id": "solution",
+              "html": "The answer is 2y = x^2 - x - 2."
+            }
+          }
         },
         "classifier_model_id": "",
         "recorded_voiceovers": {
@@ -1049,6 +1266,23 @@
                 "translation": {"translation" : "<p> Jibu hilo sio sahihi. Jaribu tena. </p>"},
                 "needs_update": false
               }
+            },
+            "solution": {
+              "pt": {
+                "data_format": "html",
+                "translation": {"translation" : "A resposta é 2y = x^2 - x - 2."},
+                "needs_update": false
+              },
+              "ar": {
+                "data_format": "html",
+                "translation": {"translation" : "الجواب هو 2y = x^2 - x - 2."},
+                "needs_update": false
+              },
+              "sw": {
+                "data_format": "html",
+                "translation": {"translation" : "Jibu ni 2y = x^2 - x - 2."},
+                "needs_update": false
+              }
             }
           }
         },
diff --git a/domain/src/main/assets/test_exp_id_5.textproto b/domain/src/main/assets/test_exp_id_5.textproto
index a6324e0e31f..527bc47958f 100644
--- a/domain/src/main/assets/test_exp_id_5.textproto
+++ b/domain/src/main/assets/test_exp_id_5.textproto
@@ -114,6 +114,29 @@ states {
         }
       }
     }
+    written_translations {
+      key: "solution"
+      value {
+        translation_mapping {
+          key: "pt"
+          value {
+            html: "A resposta \303\251 1 + 2."
+          }
+        }
+        translation_mapping {
+          key: "ar"
+          value {
+            html: "\330\247\331\204\330\254\331\210\330\247\330\250 \331\207\331\210 1 + 2."
+          }
+        }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "Jibu ni 1 + 2."
+          }
+        }
+      }
+    }
     interaction {
       id: "NumericExpressionInput"
       answer_groups {
@@ -135,6 +158,15 @@ states {
           rule_type: "MatchesExactlyWith"
         }
       }
+      solution {
+        explanation {
+          html: "The answer is 1 + 2."
+          content_id: "solution"
+        }
+        correct_answer {
+          math_expression: "1 + 2"
+        }
+      }
       default_outcome {
         dest_state_name: "NumericExpressionInput.MatchesExactlyWith"
         feedback {
@@ -255,6 +287,29 @@ states {
         }
       }
     }
+    written_translations {
+      key: "solution"
+      value {
+        translation_mapping {
+          key: "pt"
+          value {
+            html: "A resposta \303\251 1 + 2."
+          }
+        }
+        translation_mapping {
+          key: "ar"
+          value {
+            html: "\330\247\331\204\330\254\331\210\330\247\330\250 \331\207\331\210 1 + 2."
+          }
+        }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "Jibu ni 1 + 2."
+          }
+        }
+      }
+    }
     interaction {
       id: "NumericExpressionInput"
       answer_groups {
@@ -276,6 +331,15 @@ states {
           rule_type: "MatchesUpToTrivialManipulations"
         }
       }
+      solution {
+        explanation {
+          html: "The answer is 1 + 2."
+          content_id: "solution"
+        }
+        correct_answer {
+          math_expression: "1 + 2"
+        }
+      }
       default_outcome {
         dest_state_name: "NumericExpressionInput.MatchesUpToTrivialManipulations"
         feedback {
@@ -379,6 +443,29 @@ states {
         }
       }
     }
+    written_translations {
+      key: "solution"
+      value {
+        translation_mapping {
+          key: "pt"
+          value {
+            html: "A resposta \303\251 1 + 2."
+          }
+        }
+        translation_mapping {
+          key: "ar"
+          value {
+            html: "\330\247\331\204\330\254\331\210\330\247\330\250 \331\207\331\210 1 + 2."
+          }
+        }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "Jibu ni 1 + 2."
+          }
+        }
+      }
+    }
     interaction {
       id: "NumericExpressionInput"
       answer_groups {
@@ -400,6 +487,15 @@ states {
           rule_type: "IsEquivalentTo"
         }
       }
+      solution {
+        explanation {
+          html: "The answer is 1 + 2."
+          content_id: "solution"
+        }
+        correct_answer {
+          math_expression: "1 + 2"
+        }
+      }
       default_outcome {
         dest_state_name: "NumericExpressionInput.IsEquivalentTo"
         feedback {
@@ -503,6 +599,29 @@ states {
         }
       }
     }
+    written_translations {
+      key: "solution"
+      value {
+        translation_mapping {
+          key: "pt"
+          value {
+            html: "A resposta \303\251 x^2 - x - 2."
+          }
+        }
+        translation_mapping {
+          key: "ar"
+          value {
+            html: "\330\247\331\204\330\254\331\210\330\247\330\250 \331\207\331\210 x^2 - x - 2."
+          }
+        }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "Jibu ni x^2 - x - 2."
+          }
+        }
+      }
+    }
     interaction {
       id: "AlgebraicExpressionInput"
       answer_groups {
@@ -524,6 +643,15 @@ states {
           rule_type: "MatchesExactlyWith"
         }
       }
+      solution {
+        explanation {
+          html: "The answer is x^2 - x - 2."
+          content_id: "solution"
+        }
+        correct_answer {
+          math_expression: "x^2 - x - 2"
+        }
+      }
       default_outcome {
         dest_state_name: "AlgebraicExpressionInput.MatchesExactlyWith"
         feedback {
@@ -643,6 +771,29 @@ states {
         }
       }
     }
+    written_translations {
+      key: "solution"
+      value {
+        translation_mapping {
+          key: "pt"
+          value {
+            html: "A resposta \303\251 x^2 - x - 2."
+          }
+        }
+        translation_mapping {
+          key: "ar"
+          value {
+            html: "\330\247\331\204\330\254\331\210\330\247\330\250 \331\207\331\210 x^2 - x - 2."
+          }
+        }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "Jibu ni x^2 - x - 2."
+          }
+        }
+      }
+    }
     interaction {
       id: "AlgebraicExpressionInput"
       answer_groups {
@@ -664,6 +815,15 @@ states {
           rule_type: "MatchesUpToTrivialManipulations"
         }
       }
+      solution {
+        explanation {
+          html: "The answer is x^2 - x - 2."
+          content_id: "solution"
+        }
+        correct_answer {
+          math_expression: "x^2 - x - 2"
+        }
+      }
       default_outcome {
         dest_state_name: "AlgebraicExpressionInput.MatchesUpToTrivialManipulations"
         feedback {
@@ -777,6 +937,29 @@ states {
         }
       }
     }
+    written_translations {
+      key: "solution"
+      value {
+        translation_mapping {
+          key: "pt"
+          value {
+            html: "A resposta \303\251 x^2 - x - 2."
+          }
+        }
+        translation_mapping {
+          key: "ar"
+          value {
+            html: "\330\247\331\204\330\254\331\210\330\247\330\250 \331\207\331\210 x^2 - x - 2."
+          }
+        }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "Jibu ni x^2 - x - 2."
+          }
+        }
+      }
+    }
     interaction {
       id: "AlgebraicExpressionInput"
       answer_groups {
@@ -798,6 +981,15 @@ states {
           rule_type: "IsEquivalentTo"
         }
       }
+      solution {
+        explanation {
+          html: "The answer is x^2 - x - 2."
+          content_id: "solution"
+        }
+        correct_answer {
+          math_expression: "x^2 - x - 2"
+        }
+      }
       default_outcome {
         dest_state_name: "AlgebraicExpressionInput.IsEquivalentTo"
         feedback {
@@ -911,6 +1103,29 @@ states {
         }
       }
     }
+    written_translations {
+      key: "solution"
+      value {
+        translation_mapping {
+          key: "pt"
+          value {
+            html: "A resposta \303\251 2y = x^2 - x - 2."
+          }
+        }
+        translation_mapping {
+          key: "ar"
+          value {
+            html: "\330\247\331\204\330\254\331\210\330\247\330\250 \331\207\331\210 2y = x^2 - x - 2."
+          }
+        }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "Jibu ni 2y = x^2 - x - 2."
+          }
+        }
+      }
+    }
     interaction {
       id: "MathEquationInput"
       answer_groups {
@@ -932,6 +1147,15 @@ states {
           rule_type: "MatchesExactlyWith"
         }
       }
+      solution {
+        explanation {
+          html: "The answer is 2y = x^2 - x - 2."
+          content_id: "solution"
+        }
+        correct_answer {
+          math_expression: "2y = x^2 - x - 2"
+        }
+      }
       default_outcome {
         dest_state_name: "MathEquationInput.MatchesExactlyWith"
         feedback {
@@ -1054,6 +1278,29 @@ states {
         }
       }
     }
+    written_translations {
+      key: "solution"
+      value {
+        translation_mapping {
+          key: "pt"
+          value {
+            html: "A resposta \303\251 2y = x^2 - x - 2."
+          }
+        }
+        translation_mapping {
+          key: "ar"
+          value {
+            html: "\330\247\331\204\330\254\331\210\330\247\330\250 \331\207\331\210 2y = x^2 - x - 2."
+          }
+        }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "Jibu ni 2y = x^2 - x - 2."
+          }
+        }
+      }
+    }
     interaction {
       id: "MathEquationInput"
       answer_groups {
@@ -1075,6 +1322,15 @@ states {
           rule_type: "MatchesUpToTrivialManipulations"
         }
       }
+      solution {
+        explanation {
+          html: "The answer is 2y = x^2 - x - 2."
+          content_id: "solution"
+        }
+        correct_answer {
+          math_expression: "2y = x^2 - x - 2"
+        }
+      }
       default_outcome {
         dest_state_name: "MathEquationInput.MatchesUpToTrivialManipulations"
         feedback {
@@ -1191,6 +1447,29 @@ states {
         }
       }
     }
+    written_translations {
+      key: "solution"
+      value {
+        translation_mapping {
+          key: "pt"
+          value {
+            html: "A resposta \303\251 2y = x^2 - x - 2."
+          }
+        }
+        translation_mapping {
+          key: "ar"
+          value {
+            html: "\330\247\331\204\330\254\331\210\330\247\330\250 \331\207\331\210 2y = x^2 - x - 2."
+          }
+        }
+        translation_mapping {
+          key: "sw"
+          value {
+            html: "Jibu ni 2y = x^2 - x - 2."
+          }
+        }
+      }
+    }
     interaction {
       id: "MathEquationInput"
       answer_groups {
@@ -1212,6 +1491,15 @@ states {
           rule_type: "IsEquivalentTo"
         }
       }
+      solution {
+        explanation {
+          html: "The answer is 2y = x^2 - x - 2."
+          content_id: "solution"
+        }
+        correct_answer {
+          math_expression: "2y = x^2 - x - 2"
+        }
+      }
       default_outcome {
         dest_state_name: "MathEquationInput.IsEquivalentTo"
         feedback {
diff --git a/domain/src/main/assets/test_single_interactive_state_exp_with_hints_and_solution.textproto b/domain/src/main/assets/test_single_interactive_state_exp_with_hints_and_solution.textproto
index 63d3f013d60..cc7e375fe52 100644
--- a/domain/src/main/assets/test_single_interactive_state_exp_with_hints_and_solution.textproto
+++ b/domain/src/main/assets/test_single_interactive_state_exp_with_hints_and_solution.textproto
@@ -91,9 +91,8 @@ states {
         }
       }
       solution {
-        interaction_id: "TextInput"
         correct_answer {
-          correct_answer: "Finnish"
+          normalized_string: "Finnish"
         }
         explanation {
           html: "<p>'Oppia' is translated from Finnish.</p>"
diff --git a/domain/src/main/assets/test_single_interactive_state_exp_with_one_hint_and_solution.textproto b/domain/src/main/assets/test_single_interactive_state_exp_with_one_hint_and_solution.textproto
index 738f85d66b6..34dc01db31b 100644
--- a/domain/src/main/assets/test_single_interactive_state_exp_with_one_hint_and_solution.textproto
+++ b/domain/src/main/assets/test_single_interactive_state_exp_with_one_hint_and_solution.textproto
@@ -81,9 +81,8 @@ states {
         }
       }
       solution {
-        interaction_id: "TextInput"
         correct_answer {
-          correct_answer: "Finnish"
+          normalized_string: "Finnish"
         }
         explanation {
           html: "<p>'Oppia' is translated from Finnish.</p>"
diff --git a/domain/src/main/assets/test_single_interactive_state_exp_with_only_solution.textproto b/domain/src/main/assets/test_single_interactive_state_exp_with_only_solution.textproto
index 8fbd10719ae..2bf5355cdad 100644
--- a/domain/src/main/assets/test_single_interactive_state_exp_with_only_solution.textproto
+++ b/domain/src/main/assets/test_single_interactive_state_exp_with_only_solution.textproto
@@ -71,9 +71,8 @@ states {
         }
       }
       solution {
-        interaction_id: "TextInput"
         correct_answer {
-          correct_answer: "Finnish"
+          normalized_string: "Finnish"
         }
         explanation {
           html: "<p>'Oppia' is translated from Finnish.</p>"
diff --git a/domain/src/main/assets/test_single_interactive_state_exp_with_solution_missing_answer.textproto b/domain/src/main/assets/test_single_interactive_state_exp_with_solution_missing_answer.textproto
index 2b3c09241ce..a0ff8ccae0e 100644
--- a/domain/src/main/assets/test_single_interactive_state_exp_with_solution_missing_answer.textproto
+++ b/domain/src/main/assets/test_single_interactive_state_exp_with_solution_missing_answer.textproto
@@ -71,7 +71,6 @@ states {
         }
       }
       solution {
-        interaction_id: "TextInput"
         explanation {
           html: "<p>'Oppia' is translated from Finnish.</p>"
           content_id: "solution"
diff --git a/domain/src/main/assets/test_story_id_0.json b/domain/src/main/assets/test_story_id_0.json
index 9475413db61..7f8eaed4668 100644
--- a/domain/src/main/assets/test_story_id_0.json
+++ b/domain/src/main/assets/test_story_id_0.json
@@ -1,6 +1,6 @@
 {
   "story_nodes": [{
-    "description": "Learning about oppia app in First Story. It is very long but it has to be fully visible. You wil be learning about Oppia interactions. There is no second story to follow-up, but there is a second chapter.",
+    "description": "<unknown>",
     "exploration_id": "test_exp_id_2",
     "destination_node_ids": [],
     "thumbnail_filename": "",
@@ -24,7 +24,7 @@
     "title": "Image Region Selection Exploration",
     "acquired_skill_ids": []
   }, {
-    "description": "Test the different math expression/equation interactions.",
+    "description": "<unknown>",
     "exploration_id": "test_exp_id_5",
     "destination_node_ids": [],
     "thumbnail_filename": "",
diff --git a/domain/src/main/assets/test_topic_id_0_1.json b/domain/src/main/assets/test_topic_id_0_1.json
index 3fa76d35f07..bc6d2594c2f 100644
--- a/domain/src/main/assets/test_topic_id_0_1.json
+++ b/domain/src/main/assets/test_topic_id_0_1.json
@@ -1,6 +1,9 @@
 {
   "topic_id": "test_topic_id_0",
-  "topic_name": "",
+  "topic_title": {
+    "content_id": "title",
+    "html": "Test subtopic"
+  },
   "page_contents": {
     "subtitled_html": {
       "content_id": "content",
diff --git a/domain/src/main/assets/umPkwp0L1M0-.json b/domain/src/main/assets/umPkwp0L1M0-.json
index 1b57b758169..36491983a32 100644
--- a/domain/src/main/assets/umPkwp0L1M0-.json
+++ b/domain/src/main/assets/umPkwp0L1M0-.json
@@ -81,7 +81,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 10": {
         "content": {
@@ -407,10 +408,12 @@
           "solution": {
             "answer_is_exclusive": true,
             "correct_answer": {
-              "isNegative": false,
-              "wholeNumber": 0,
-              "numerator": 3,
-              "denominator": 10
+              "fraction": {
+                "isNegative": false,
+                "wholeNumber": 0,
+                "numerator": 3,
+                "denominator": 10
+              }
             },
             "explanation": {
               "content_id": "solution",
@@ -1004,7 +1007,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Final Test A second try": {
         "content": {
@@ -1158,10 +1162,12 @@
           "solution": {
             "answer_is_exclusive": false,
             "correct_answer": {
-              "isNegative": false,
-              "wholeNumber": 0,
-              "numerator": 4,
-              "denominator": 6
+              "fraction": {
+                "isNegative": false,
+                "wholeNumber": 0,
+                "numerator": 4,
+                "denominator": 6
+              }
             },
             "explanation": {
               "content_id": "solution",
@@ -1557,7 +1563,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Introduction": {
         "content": {
@@ -1631,7 +1638,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Ending": {
         "content": {
@@ -1705,7 +1713,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Parts of a whole": {
         "content": {
@@ -1912,7 +1921,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Writing out fractions confirmation": {
         "content": {
@@ -1986,7 +1996,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Mr. Baker": {
         "content": {
@@ -2060,7 +2071,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Writing out Fractions": {
         "content": {
@@ -2569,7 +2581,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Congratulations": {
         "content": {
@@ -2631,7 +2644,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Final Test A": {
         "content": {
@@ -2910,7 +2924,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Final Test B": {
         "content": {
@@ -3082,7 +3097,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Final Test C": {
         "content": {
@@ -3361,7 +3377,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 3": {
         "content": {
@@ -3576,7 +3593,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 1": {
         "content": {
@@ -3882,7 +3900,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Final Test B second try": {
         "content": {
@@ -4128,10 +4147,12 @@
           "solution": {
             "answer_is_exclusive": true,
             "correct_answer": {
-              "isNegative": false,
-              "wholeNumber": 0,
-              "numerator": 5,
-              "denominator": 12
+              "fraction": {
+                "isNegative": false,
+                "wholeNumber": 0,
+                "numerator": 5,
+                "denominator": 12
+              }
             },
             "explanation": {
               "content_id": "solution",
@@ -4629,7 +4650,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 2": {
         "content": {
@@ -4898,7 +4920,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 5": {
         "content": {
@@ -5318,7 +5341,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 4": {
         "content": {
@@ -5615,10 +5639,12 @@
           "solution": {
             "answer_is_exclusive": true,
             "correct_answer": {
-              "isNegative": false,
-              "wholeNumber": 0,
-              "numerator": 1,
-              "denominator": 6
+              "fraction": {
+                "isNegative": false,
+                "wholeNumber": 0,
+                "numerator": 1,
+                "denominator": 6
+              }
             },
             "explanation": {
               "content_id": "solution",
@@ -6134,7 +6160,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 7": {
         "content": {
@@ -6510,7 +6537,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 6": {
         "content": {
@@ -6867,7 +6895,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 9": {
         "content": {
@@ -7411,7 +7440,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Practice 8": {
         "content": {
@@ -7562,7 +7592,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Recap Writing Fractions": {
         "content": {
@@ -7636,7 +7667,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       },
       "Numerator and Denominator": {
         "content": {
@@ -8069,7 +8101,8 @@
           }
         },
         "solicit_answer_details": false,
-        "next_content_id_index": -1
+        "next_content_id_index": -1,
+        "linked_skill_id": null
       }
     },
     "objective": "Learn the fundamentals of fractions",
diff --git a/domain/src/main/assets/umPkwp0L1M0-.textproto b/domain/src/main/assets/umPkwp0L1M0-.textproto
index d7216772071..21529c7b597 100644
--- a/domain/src/main/assets/umPkwp0L1M0-.textproto
+++ b/domain/src/main/assets/umPkwp0L1M0-.textproto
@@ -1103,16 +1103,17 @@ states {
         }
       }
       solution {
-        interaction_id: "FractionInput"
         answer_is_exclusive: true
-        correct_answer {
-          denominator: 10
-          numerator: 3
-        }
         explanation {
           html: "<p>The cake is divided into 10 equal pieces, so the denominator is 10.</p><p>3 of those pieces have mangoes, so the numerator is 3.</p><p>Therefore, the fraction we want is 3/10.</p>"
           content_id: "solution"
         }
+        correct_answer {
+          fraction {
+            numerator: 3
+            denominator: 10
+          }
+        }
       }
       hint {
         hint_content {
@@ -1770,15 +1771,16 @@ states {
         }
       }
       solution {
-        interaction_id: "FractionInput"
-        correct_answer {
-          denominator: 6
-          numerator: 4
-        }
         explanation {
           html: "<p>There are 4 pieces with dhal on them, so the numerator is 4. (We don\'t care about the pieces which are burnt, since the question is only about the pieces with dhal on them.)</p><p>There are 6 pieces of roti in total, so the denominator is 6.</p><p>Therefore, the answer is 4/6.</p>"
           content_id: "solution"
         }
+        correct_answer {
+          fraction {
+            numerator: 4
+            denominator: 6
+          }
+        }
       }
       hint {
         hint_content {
@@ -5451,16 +5453,17 @@ states {
         }
       }
       solution {
-        interaction_id: "FractionInput"
         answer_is_exclusive: true
-        correct_answer {
-          denominator: 12
-          numerator: 5
-        }
         explanation {
           html: "<p>The whole cake is divided into 12 equal pieces.. So, the <strong>denominator</strong> is 12.</p><p>5 pieces have mangoes and chocolate chips, but no cherries. So, the <strong>numerator</strong> is 5.</p><p>Therefore, the answer is 5/12.</p>"
           content_id: "solution"
         }
+        correct_answer {
+          fraction {
+            numerator: 5
+            denominator: 12
+          }
+        }
       }
       hint {
         hint_content {
@@ -7254,16 +7257,17 @@ states {
         }
       }
       solution {
-        interaction_id: "FractionInput"
         answer_is_exclusive: true
-        correct_answer {
-          denominator: 6
-          numerator: 1
-        }
         explanation {
           html: "<p>The first number is the number of<strong> selected </strong>pieces, which is 1.</p><p>The second number is the <strong>total</strong> number of pieces, which is 6.</p><p>So, the fraction is 1/6.</p>"
           content_id: "solution"
         }
+        correct_answer {
+          fraction {
+            numerator: 1
+            denominator: 6
+          }
+        }
       }
       hint {
         hint_content {
diff --git a/domain/src/main/assets/wANbh4oOClga.json b/domain/src/main/assets/wANbh4oOClga.json
index 00f64c569ad..962e8a168e2 100644
--- a/domain/src/main/assets/wANbh4oOClga.json
+++ b/domain/src/main/assets/wANbh4oOClga.json
@@ -1,6 +1,6 @@
 {
   "story_nodes": [{
-    "description": "Matthew learns about fractions.",
+    "description": "<unknown>",
     "exploration_id": "umPkwp0L1M0-",
     "destination_node_ids": [],
     "thumbnail_filename": "",
@@ -8,11 +8,11 @@
     "id": "umPkwp0L1M0-",
     "prerequisite_skill_ids": [],
     "thumbnail_bg_color": "#d68f78",
-    "outline": "This is outline/summary for <b>What is a Fraction?</b>",
+    "outline": "Matthew learns about fractions.",
     "title": "What is a Fraction?",
     "acquired_skill_ids": []
   }, {
-    "description": "Matthew learns about equal parts in fractions.",
+    "description": "<unknown>",
     "exploration_id": "MjZzEVOG47_1",
     "destination_node_ids": [],
     "thumbnail_filename": "",
@@ -20,7 +20,7 @@
     "id": "MjZzEVOG47_1",
     "prerequisite_skill_ids": [],
     "thumbnail_bg_color": "#d678f8",
-    "outline": "This is outline/summary for <b>The Meaning of Equal Parts</b>",
+    "outline": "Matthew learns about equal parts in fractions.",
     "title": "The Meaning of Equal Parts",
     "acquired_skill_ids": []
   }],
diff --git a/domain/src/main/java/org/oppia/android/domain/hintsandsolution/HelpIndexExtensions.kt b/domain/src/main/java/org/oppia/android/domain/hintsandsolution/HelpIndexExtensions.kt
index f2339f68673..032386a4c6b 100644
--- a/domain/src/main/java/org/oppia/android/domain/hintsandsolution/HelpIndexExtensions.kt
+++ b/domain/src/main/java/org/oppia/android/domain/hintsandsolution/HelpIndexExtensions.kt
@@ -9,7 +9,7 @@ import org.oppia.android.app.model.HelpIndex.IndexTypeCase.SHOW_SOLUTION
 import org.oppia.android.app.model.Hint
 
 /**
- * Returns whether the specified [hintIndex] relative to the proivded list of [Hint]s has been seen
+ * Returns whether the specified [hintIndex] relative to the provided list of [Hint]s has been seen
  * by the user based on this [HelpIndex].
  */
 fun HelpIndex.isHintRevealed(hintIndex: Int, hintList: List<Hint>): Boolean {
@@ -22,6 +22,27 @@ fun HelpIndex.isHintRevealed(hintIndex: Int, hintList: List<Hint>): Boolean {
   return hintIndex <= lastShownHintIndex
 }
 
+/**
+ * Returns, based on the specified [HelpIndex], an updated version of [hintList] that contains
+ * exactly the hints currently revealed or available to be revealed.
+ */
+fun HelpIndex.dropLastUnavailable(hintList: List<Hint>): List<Hint> {
+  val nextAvailableHintIndex = when (indexTypeCase) {
+    NEXT_AVAILABLE_HINT_INDEX -> nextAvailableHintIndex
+    LATEST_REVEALED_HINT_INDEX -> latestRevealedHintIndex
+    SHOW_SOLUTION, EVERYTHING_REVEALED -> hintList.lastIndex // All hints are available.
+    INDEXTYPE_NOT_SET, null -> -1 // Something failed, so assume no hints are visible.
+  }
+  return hintList.take(nextAvailableHintIndex + 1)
+}
+
+/**
+ * Returns whether, based on the specified [HelpIndex], the solution is available to be viewed
+ * (either as a new reveal or if it's already available, per [isSolutionRevealed]).
+ */
+fun HelpIndex.isSolutionAvailable(): Boolean =
+  indexTypeCase == SHOW_SOLUTION || isSolutionRevealed()
+
 /**
  * Returns whether, based on a specified [HelpIndex], the solution has been viewed by the learner.
  */
diff --git a/domain/src/main/java/org/oppia/android/domain/util/StateRetriever.kt b/domain/src/main/java/org/oppia/android/domain/util/StateRetriever.kt
index 0a38bc3c4ba..130cc297e61 100644
--- a/domain/src/main/java/org/oppia/android/domain/util/StateRetriever.kt
+++ b/domain/src/main/java/org/oppia/android/domain/util/StateRetriever.kt
@@ -3,7 +3,6 @@ package org.oppia.android.domain.util
 import org.json.JSONArray
 import org.json.JSONObject
 import org.oppia.android.app.model.AnswerGroup
-import org.oppia.android.app.model.CorrectAnswer
 import org.oppia.android.app.model.CustomSchemaValue
 import org.oppia.android.app.model.Fraction
 import org.oppia.android.app.model.Hint
@@ -79,7 +78,7 @@ class StateRetriever @Inject constructor() {
       addAllHint(createListOfHintsFromJson(interactionJson.getJSONArray("hints")))
 
       // Only set the solution if one has been defined.
-      createSolutionFromJson(interactionJson.optJSONObject("solution"))?.let { solution = it }
+      createSolutionFromJson(interactionJson.optJSONObject("solution"), id)?.let { solution = it }
     }.build()
   }
 
@@ -150,36 +149,19 @@ class StateRetriever @Inject constructor() {
   }
 
   // Creates a solution object from JSON
-  private fun createSolutionFromJson(optionalSolutionJson: JSONObject?): Solution? {
+  private fun createSolutionFromJson(
+    optionalSolutionJson: JSONObject?, interactionId: String
+  ): Solution? {
     return optionalSolutionJson?.let { solutionJson ->
       return Solution.newBuilder().apply {
-        correctAnswer = createCorrectAnswer(solutionJson)
+        correctAnswer =
+          parseExactSolutionObject(solutionJson.getJSONObject("correct_answer"), interactionId)
         explanation = parseSubtitledHtml(solutionJson.getJSONObject("explanation"))
         answerIsExclusive = solutionJson.getBoolean("answer_is_exclusive")
       }.build()
     }
   }
 
-  private fun createCorrectAnswer(containerObject: JSONObject): CorrectAnswer {
-    val correctAnswerObject = containerObject.optJSONObject("correct_answer")
-    return when {
-      correctAnswerObject != null -> {
-        CorrectAnswer.newBuilder()
-          .setNumerator(correctAnswerObject.getInt("numerator"))
-          .setDenominator(correctAnswerObject.getInt("denominator"))
-          .setWholeNumber(correctAnswerObject.getInt("wholeNumber"))
-          .setIsNegative(correctAnswerObject.getBoolean("isNegative"))
-          .build()
-      }
-      containerObject.optString("correct_answer", /* fallback= */ null) != null -> {
-        CorrectAnswer.newBuilder()
-          .setCorrectAnswer(containerObject.getStringFromObject("correct_answer"))
-          .build()
-      }
-      else -> CorrectAnswer.getDefaultInstance() // For incompatible types.
-    }
-  }
-
   /**
    * Returns a new [SubtitledHtml] from a specified container [JSONObject] that contains an entry
    * keyed on 'feedback'.
@@ -401,6 +383,40 @@ class StateRetriever @Inject constructor() {
     }
   }
 
+  private fun parseExactSolutionObject(
+    inputJson: JSONObject,
+    interactionId: String
+  ): InteractionObject {
+    return when (interactionId) {
+      "TextInput" -> {
+        InteractionObject.newBuilder().apply {
+          normalizedString = inputJson.getStringFromObject("normalized_string")
+        }.build()
+      }
+      "NumericInput" -> {
+        InteractionObject.newBuilder().apply {
+          real = inputJson.getDouble("real")
+        }.build()
+      }
+      "FractionInput" -> {
+        InteractionObject.newBuilder().apply {
+          fraction = parseFraction(inputJson.getJSONObject("fraction"))
+        }.build()
+      }
+      "RatioExpressionInput" ->{
+        InteractionObject.newBuilder().apply {
+          ratioExpression = parseRatio(inputJson.getJSONArray("ratio_expression"))
+        }.build()
+      }
+      "NumericExpressionInput", "AlgebraicExpressionInput", "MathEquationInput" -> {
+        InteractionObject.newBuilder().apply {
+          mathExpression = inputJson.getStringFromObject("math_expression")
+        }.build()
+      }
+      else -> error("Encountered unsupported interaction ID for solutions: $interactionId")
+    }
+  }
+
   private fun parseTranslatableSetOfNormalizedString(
     translatableSetOfStringsJson: JSONObject
   ): TranslatableSetOfNormalizedString = TranslatableSetOfNormalizedString.newBuilder().apply {
diff --git a/model/src/main/proto/exploration.proto b/model/src/main/proto/exploration.proto
index 82862a0dff7..24ec703f0a8 100644
--- a/model/src/main/proto/exploration.proto
+++ b/model/src/main/proto/exploration.proto
@@ -172,12 +172,16 @@ message TrainingData {
 // Structure for a single solution
 // Maps from: data/src/main/java/org/oppia/android/android/data/backends/gae/model/GaeSolution.kt
 message Solution {
-  string interaction_id = 1;
+  reserved 1; // Was a string containing the ID of the interaction containing the solution.
+
   // Flag that is true if correct_answer is the only correct answer of the question.
   bool answer_is_exclusive = 2;
 
-  // correct_answer of the State.
-  CorrectAnswer correct_answer = 3;
+  // Represented a representation of correct_answer that was specific to strings and fractions.
+  reserved 3;
+
+  // The correct answer to the state's primary question prompt.
+  InteractionObject correct_answer = 6;
 
   // Core explanation to the correct answer.
   SubtitledHtml explanation = 4;
@@ -187,16 +191,6 @@ message Solution {
   reserved 5;
 }
 
-// Structure for a Correct answer in Solution
-// Maps from: data/src/main/java/org/oppia/android/android/data/backends/gae/model/GaeSolution.kt
-message CorrectAnswer {
-  int32 denominator = 1;
-  int32 numerator = 2;
-  int32 whole_number = 3;
-  bool is_negative = 4;
-  string correct_answer = 5;
-}
-
 // Structure for a single hint
 // Maps from: data/src/main/java/org/oppia/android/android/data/backends/gae/model/GaeHint.kt
 message Hint {

From 970dfaf2224afc766cb90cd3de38e479dd68429d Mon Sep 17 00:00:00 2001
From: Ben Henning <ben@oppia.org>
Date: Wed, 18 Jan 2023 16:07:39 -0800
Subject: [PATCH 09/38] Lint & static check fixes.

---
 .../MarkChaptersCompletedActivity.kt          |  4 +-
 .../MarkChaptersCompletedFragment.kt          |  3 +-
 .../MarkChaptersCompletedFragmentPresenter.kt |  4 +-
 .../app/hintsandsolution/HintViewModel.kt     | 17 ++++++-
 ...HintsAndSolutionDialogFragmentPresenter.kt |  2 +-
 .../HintsAndSolutionViewModel.kt              | 45 +++++++++++++++----
 .../app/hintsandsolution/SolutionViewModel.kt | 30 +++++++++++--
 .../app/player/state/StateViewModel.kt        |  2 +-
 .../profile/ProfileEditFragmentPresenter.kt   |  2 +-
 .../settings/profile/ProfileEditViewModel.kt  |  2 +-
 .../android/domain/util/StateRetriever.kt     |  5 ++-
 .../assets/kdoc_validity_exemptions.textproto |  4 --
 scripts/assets/test_file_exemptions.textproto |  3 +-
 .../util/logging/EventBundleCreator.kt        |  2 +-
 14 files changed, 94 insertions(+), 31 deletions(-)

diff --git a/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedActivity.kt b/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedActivity.kt
index fcfc194cc96..e8d24483432 100644
--- a/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedActivity.kt
@@ -44,7 +44,9 @@ class MarkChaptersCompletedActivity : InjectableAppCompatActivity() {
       "MarkChaptersCompletedActivity.show_confirmation_notice"
 
     fun createMarkChaptersCompletedIntent(
-      context: Context, internalProfileId: Int, showConfirmationNotice: Boolean
+      context: Context,
+      internalProfileId: Int,
+      showConfirmationNotice: Boolean
     ): Intent {
       return Intent(context, MarkChaptersCompletedActivity::class.java).apply {
         putExtra(PROFILE_ID_EXTRA_KEY, internalProfileId)
diff --git a/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedFragment.kt b/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedFragment.kt
index 18f0b3c12b4..9ea2d5af880 100644
--- a/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedFragment.kt
+++ b/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedFragment.kt
@@ -25,7 +25,8 @@ class MarkChaptersCompletedFragment : InjectableFragment() {
 
     /** Returns a new [MarkChaptersCompletedFragment]. */
     fun newInstance(
-      internalProfileId: Int, showConfirmationNotice: Boolean
+      internalProfileId: Int,
+      showConfirmationNotice: Boolean
     ): MarkChaptersCompletedFragment {
       val markChaptersCompletedFragment = MarkChaptersCompletedFragment()
       val args = Bundle()
diff --git a/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedFragmentPresenter.kt
index 140f2f47b11..98b5440f534 100644
--- a/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedFragmentPresenter.kt
@@ -8,16 +8,16 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import org.oppia.android.R
 import org.oppia.android.app.fragment.FragmentScope
 import org.oppia.android.app.model.ProfileId
 import org.oppia.android.app.recyclerview.BindableAdapter
+import org.oppia.android.app.translation.AppLanguageResourceHandler
 import org.oppia.android.databinding.MarkChaptersCompletedChapterSummaryViewBinding
 import org.oppia.android.databinding.MarkChaptersCompletedFragmentBinding
 import org.oppia.android.databinding.MarkChaptersCompletedStorySummaryViewBinding
 import org.oppia.android.domain.devoptions.ModifyLessonProgressController
 import javax.inject.Inject
-import org.oppia.android.R
-import org.oppia.android.app.translation.AppLanguageResourceHandler
 
 /** The presenter for [MarkChaptersCompletedFragment]. */
 @FragmentScope
diff --git a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintViewModel.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintViewModel.kt
index 2093882c03f..57b4b8a2f47 100644
--- a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintViewModel.kt
@@ -3,9 +3,22 @@ package org.oppia.android.app.hintsandsolution
 import androidx.databinding.ObservableBoolean
 import org.oppia.android.util.parser.html.CustomHtmlContentHandler
 
+/**
+ * [HintsAndSolutionItemViewModel] that represents a single hint that can be shown to the user.
+ *
+ * @property title the title of this hint, relative to others (this is generated by the app)
+ * @property hintSummary the core hint text (which may contain HTML) to show the user
+ * @property isHintRevealed whether the hint is currently expanded and viewable
+ */
 class HintViewModel(
-  val title: String, val hintSummary: String, val isHintRevealed: ObservableBoolean
-): HintsAndSolutionItemViewModel() {
+  val title: String,
+  val hintSummary: String,
+  val isHintRevealed: ObservableBoolean
+) : HintsAndSolutionItemViewModel() {
+  /**
+   * A screenreader-friendly version of [hintSummary] that should be used for readout, in place of
+   * the original summary.
+   */
   val hintContentDescription: String by lazy {
     CustomHtmlContentHandler.fromHtml(
       hintSummary,
diff --git a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragmentPresenter.kt
index 477f8067506..c1bf05fb212 100644
--- a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragmentPresenter.kt
@@ -13,10 +13,10 @@ import org.oppia.android.app.model.WrittenTranslationContext
 import org.oppia.android.app.recyclerview.BindableAdapter
 import org.oppia.android.app.topic.conceptcard.ConceptCardFragment
 import org.oppia.android.app.translation.AppLanguageResourceHandler
+import org.oppia.android.databinding.HintSummaryBinding
 import org.oppia.android.databinding.HintsAndSolutionFragmentBinding
 import org.oppia.android.databinding.ReturnToLessonButtonItemBinding
 import org.oppia.android.databinding.SolutionSummaryBinding
-import org.oppia.android.databinding.HintSummaryBinding
 import org.oppia.android.util.accessibility.AccessibilityService
 import org.oppia.android.util.gcsresource.DefaultResourceBucketName
 import org.oppia.android.util.parser.html.ExplorationHtmlParserEntityType
diff --git a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionViewModel.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionViewModel.kt
index aaa264ba9c4..f604f7f6547 100644
--- a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionViewModel.kt
@@ -2,22 +2,25 @@ package org.oppia.android.app.hintsandsolution
 
 import androidx.databinding.ObservableBoolean
 import org.oppia.android.R
-import org.oppia.android.app.fragment.FragmentScope
 import org.oppia.android.app.model.HelpIndex
 import org.oppia.android.app.model.Hint
 import org.oppia.android.app.model.Solution
+import org.oppia.android.app.model.State
 import org.oppia.android.app.model.WrittenTranslationContext
 import org.oppia.android.app.translation.AppLanguageResourceHandler
+import org.oppia.android.app.viewmodel.ObservableViewModel
+import org.oppia.android.domain.hintsandsolution.dropLastUnavailable
 import org.oppia.android.domain.hintsandsolution.isHintRevealed
+import org.oppia.android.domain.hintsandsolution.isSolutionAvailable
 import org.oppia.android.domain.hintsandsolution.isSolutionRevealed
 import org.oppia.android.domain.translation.TranslationController
 import javax.inject.Inject
-import org.oppia.android.app.model.State
-import org.oppia.android.app.viewmodel.ObservableViewModel
-import org.oppia.android.domain.hintsandsolution.dropLastUnavailable
-import org.oppia.android.domain.hintsandsolution.isSolutionAvailable
 
-/** View model for a lesson's hints/solution list. */
+/**
+ * View model for a lesson's hints/solution list.
+ *
+ * Instances of this class are created using its [Factory].
+ */
 class HintsAndSolutionViewModel private constructor(
   private val state: State,
   private val helpIndex: HelpIndex,
@@ -25,16 +28,30 @@ class HintsAndSolutionViewModel private constructor(
   private val resourceHandler: AppLanguageResourceHandler,
   private val translationController: TranslationController,
   private val solutionViewModelFactory: SolutionViewModel.Factory
-): ObservableViewModel() {
+) : ObservableViewModel() {
   private val hintList by lazy { helpIndex.dropLastUnavailable(state.interaction.hintList) }
   private val solution by lazy {
     state.interaction.solution.takeIf { it.hasExplanation() && helpIndex.isSolutionAvailable() }
   }
 
+  /**
+   * The [ObservableBoolean] which indicates whether the solution is currently available to be
+   * viewed (that is, available to & revealed by the user).
+   */
   val isSolutionRevealed: ObservableBoolean by lazy {
     ObservableBoolean(helpIndex.isSolutionRevealed())
   }
+
+  /**
+   * The list of [HintsAndSolutionItemViewModel]s to display in the hint list represented by this
+   * model.
+   */
   val itemList: List<HintsAndSolutionItemViewModel> by lazy { createViewModels() }
+
+  /**
+   * The index into [itemList] where the solution would be present, if it's available to view
+   * (otherwise, this index corresponds to the most recently available hint).
+   */
   val solutionIndex: Int get() = itemList.lastIndex - 1
 
   private fun createViewModels(): List<HintsAndSolutionItemViewModel> {
@@ -46,7 +63,9 @@ class HintsAndSolutionViewModel private constructor(
   }
 
   private fun createHintViewModel(
-    hintIndex: Int, hint: Hint, isHintRevealed: ObservableBoolean
+    hintIndex: Int,
+    hint: Hint,
+    isHintRevealed: ObservableBoolean
   ): HintViewModel {
     return HintViewModel(
       title = resourceHandler.getStringInLocaleWithWrapping(
@@ -73,13 +92,21 @@ class HintsAndSolutionViewModel private constructor(
     )
   }
 
+  /** Application-injectable factory for creating [HintsAndSolutionViewModel]s (see [create]). */
   class Factory @Inject constructor(
     private val resourceHandler: AppLanguageResourceHandler,
     private val translationController: TranslationController,
     private val solutionViewModelFactory: SolutionViewModel.Factory
   ) {
+    /**
+     * Returns a new [HintsAndSolutionViewModel] that populates a list of item view models (to be
+     * bound to a recycler view) using the included [state] and [helpIndex] to source the current
+     * hints/solution state, and the provided [writtenTranslationContext] for localization.
+     */
     fun create(
-      state: State, helpIndex: HelpIndex, writtenTranslationContext: WrittenTranslationContext
+      state: State,
+      helpIndex: HelpIndex,
+      writtenTranslationContext: WrittenTranslationContext
     ): HintsAndSolutionViewModel {
       return HintsAndSolutionViewModel(
         state,
diff --git a/app/src/main/java/org/oppia/android/app/hintsandsolution/SolutionViewModel.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/SolutionViewModel.kt
index 08ec6bb4805..cd70ceaae8e 100644
--- a/app/src/main/java/org/oppia/android/app/hintsandsolution/SolutionViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/hintsandsolution/SolutionViewModel.kt
@@ -1,10 +1,8 @@
 package org.oppia.android.app.hintsandsolution
 
 import androidx.databinding.ObservableBoolean
-import androidx.databinding.ObservableField
-import androidx.lifecycle.ViewModel
 import org.oppia.android.R
-import javax.inject.Inject
+import org.oppia.android.app.hintsandsolution.HintsAndSolutionViewModel.Factory
 import org.oppia.android.app.model.Interaction
 import org.oppia.android.app.model.InteractionObject
 import org.oppia.android.app.model.InteractionObject.ObjectTypeCase.BOOL_VALUE
@@ -41,8 +39,16 @@ import org.oppia.android.util.math.toAnswerString
 import org.oppia.android.util.math.toPlainString
 import org.oppia.android.util.math.toRawLatex
 import org.oppia.android.util.parser.html.CustomHtmlContentHandler
+import javax.inject.Inject
 
-/** [ViewModel] for Solution in [HintsAndSolutionDialogFragment]. */
+/**
+ * [HintsAndSolutionItemViewModel] that represents a solution that the user may reveal.
+ *
+ * Instances of this class are created using its [Factory].
+ *
+ * @property solutionSummary the solution's explanation text (which may contain HTML)
+ * @property isSolutionRevealed whether the solution is currently expanded and viewable
+ */
 class SolutionViewModel private constructor(
   val solutionSummary: String,
   private val correctAnswer: InteractionObject,
@@ -53,6 +59,10 @@ class SolutionViewModel private constructor(
   private val appLanguageResourceHandler: AppLanguageResourceHandler,
   private val mathExpressionAccessibilityUtil: MathExpressionAccessibilityUtil
 ) : HintsAndSolutionItemViewModel() {
+  /**
+   * A screenreader-friendly version of [solutionSummary] that should be used for readout, in place
+   * of the original summary.
+   */
   val solutionSummaryContentDescription by lazy {
     CustomHtmlContentHandler.fromHtml(
       solutionSummary,
@@ -60,8 +70,13 @@ class SolutionViewModel private constructor(
       customTagHandlers = mapOf()
     ).toString()
   }
+
+  /** A displayable HTML representation of the correct answer presented by this model's solution. */
   val correctAnswerHtml: String by lazy { computeCorrectAnswerHtml() }
+
+  /** A screenreader-friendly readable version of [correctAnswerHtml]. */
   val correctAnswerContentDescription: String by lazy { computeCorrectAnswerContentDescription() }
+
   private val correctAnswerTextStringResId = if (isSolutionExclusive) {
     R.string.hints_list_exclusive_solution_text
   } else R.string.hints_list_possible_solution_text
@@ -217,10 +232,17 @@ class SolutionViewModel private constructor(
       customizationArgsMap["useFractionForDivision"]?.boolValue ?: false
   }
 
+  /** Application-injectable factory to create [SolutionViewModel]s (see [create]). */
   class Factory @Inject constructor(
     private val appLanguageResourceHandler: AppLanguageResourceHandler,
     private val mathExpressionAccessibilityUtil: MathExpressionAccessibilityUtil
   ) {
+    /**
+     * Returns a new [SolutionViewModel] with the specified summary HTML text, correct answer,
+     * [isSolutionRevealed] tracking [ObservableBoolean], whether the solution is exclusive, and its
+     * answer context (such as the [interaction] that the answer can be submitted to and the
+     * displayed state's current [writtenTranslationContext] for localization).
+     */
     fun create(
       solutionSummary: String,
       correctAnswer: InteractionObject,
diff --git a/app/src/main/java/org/oppia/android/app/player/state/StateViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/StateViewModel.kt
index 4cc67adedad..897b069014a 100644
--- a/app/src/main/java/org/oppia/android/app/player/state/StateViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/player/state/StateViewModel.kt
@@ -24,9 +24,9 @@ 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 javax.inject.Inject
 import org.oppia.android.util.platformparameter.LearnerStudyAnalytics
 import org.oppia.android.util.platformparameter.PlatformParameterValue
+import javax.inject.Inject
 
 /** [ViewModel] for state-fragment. */
 @FragmentScope
diff --git a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditFragmentPresenter.kt
index 47d4fb8443f..ff02e45b9ff 100644
--- a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditFragmentPresenter.kt
@@ -10,6 +10,7 @@ import androidx.lifecycle.Observer
 import org.oppia.android.R
 import org.oppia.android.app.administratorcontrols.AdministratorControlsActivity
 import org.oppia.android.app.administratorcontrols.ProfileEditDeletionDialogListener
+import org.oppia.android.app.devoptions.markchapterscompleted.MarkChaptersCompletedActivity
 import org.oppia.android.app.fragment.FragmentScope
 import org.oppia.android.app.model.ProfileId
 import org.oppia.android.databinding.ProfileEditFragmentBinding
@@ -18,7 +19,6 @@ import org.oppia.android.domain.profile.ProfileManagementController
 import org.oppia.android.util.data.AsyncResult
 import org.oppia.android.util.data.DataProviders.Companion.toLiveData
 import javax.inject.Inject
-import org.oppia.android.app.devoptions.markchapterscompleted.MarkChaptersCompletedActivity
 
 /** Argument key for profile deletion dialog in [ProfileEditFragment]. */
 const val TAG_PROFILE_DELETION_DIALOG = "PROFILE_DELETION_DIALOG"
diff --git a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditViewModel.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditViewModel.kt
index b096bb45961..c74d527c239 100644
--- a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditViewModel.kt
@@ -12,9 +12,9 @@ import org.oppia.android.domain.profile.ProfileManagementController
 import org.oppia.android.util.data.AsyncResult
 import org.oppia.android.util.data.DataProviders.Companion.toLiveData
 import org.oppia.android.util.platformparameter.EnableDownloadsSupport
+import org.oppia.android.util.platformparameter.LearnerStudyAnalytics
 import org.oppia.android.util.platformparameter.PlatformParameterValue
 import javax.inject.Inject
-import org.oppia.android.util.platformparameter.LearnerStudyAnalytics
 
 /** The ViewModel for [ProfileEditActivity]. */
 @FragmentScope
diff --git a/domain/src/main/java/org/oppia/android/domain/util/StateRetriever.kt b/domain/src/main/java/org/oppia/android/domain/util/StateRetriever.kt
index 130cc297e61..ec411290f38 100644
--- a/domain/src/main/java/org/oppia/android/domain/util/StateRetriever.kt
+++ b/domain/src/main/java/org/oppia/android/domain/util/StateRetriever.kt
@@ -150,7 +150,8 @@ class StateRetriever @Inject constructor() {
 
   // Creates a solution object from JSON
   private fun createSolutionFromJson(
-    optionalSolutionJson: JSONObject?, interactionId: String
+    optionalSolutionJson: JSONObject?,
+    interactionId: String
   ): Solution? {
     return optionalSolutionJson?.let { solutionJson ->
       return Solution.newBuilder().apply {
@@ -403,7 +404,7 @@ class StateRetriever @Inject constructor() {
           fraction = parseFraction(inputJson.getJSONObject("fraction"))
         }.build()
       }
-      "RatioExpressionInput" ->{
+      "RatioExpressionInput" -> {
         InteractionObject.newBuilder().apply {
           ratioExpression = parseRatio(inputJson.getJSONArray("ratio_expression"))
         }.build()
diff --git a/scripts/assets/kdoc_validity_exemptions.textproto b/scripts/assets/kdoc_validity_exemptions.textproto
index 53687f18ded..bcde45b622b 100644
--- a/scripts/assets/kdoc_validity_exemptions.textproto
+++ b/scripts/assets/kdoc_validity_exemptions.textproto
@@ -24,7 +24,6 @@ exempted_file_path: "app/src/main/java/org/oppia/android/app/completedstorylist/
 exempted_file_path: "app/src/main/java/org/oppia/android/app/customview/LessonThumbnailImageView.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/customview/SegmentedCircularProgressView.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/notice/AutomaticAppDeprecationNoticeDialogFragmentPresenter.kt"
-exempted_file_path: "app/src/main/java/org/oppia/android/app/devoptions/DeveloperOptionsActivity.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/devoptions/DeveloperOptionsActivityPresenter.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/devoptions/DeveloperOptionsFragment.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/devoptions/DeveloperOptionsFragmentPresenter.kt"
@@ -33,7 +32,6 @@ exempted_file_path: "app/src/main/java/org/oppia/android/app/devoptions/Develope
 exempted_file_path: "app/src/main/java/org/oppia/android/app/devoptions/devoptionsitemviewmodel/DeveloperOptionsItemViewModel.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedActivity.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedActivityPresenter.kt"
-exempted_file_path: "app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedFragment.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedFragmentPresenter.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedViewModel.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/testing/MarkChaptersCompletedTestActivity.kt"
@@ -80,8 +78,6 @@ exempted_file_path: "app/src/main/java/org/oppia/android/app/help/faq/faqsingle/
 exempted_file_path: "app/src/main/java/org/oppia/android/app/help/faq/faqsingle/FAQSingleActivityPresenter.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragment.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragmentPresenter.kt"
-exempted_file_path: "app/src/main/java/org/oppia/android/app/hintsandsolution/HintsViewModel.kt"
-exempted_file_path: "app/src/main/java/org/oppia/android/app/hintsandsolution/SolutionViewModel.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/home/HomeActivity.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/home/HomeActivityPresenter.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/home/HomeFragmentPresenter.kt"
diff --git a/scripts/assets/test_file_exemptions.textproto b/scripts/assets/test_file_exemptions.textproto
index dde508b6c11..f688366a3a9 100644
--- a/scripts/assets/test_file_exemptions.textproto
+++ b/scripts/assets/test_file_exemptions.textproto
@@ -190,7 +190,8 @@ exempted_file_path: "app/src/main/java/org/oppia/android/app/hintsandsolution/Hi
 exempted_file_path: "app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragmentPresenter.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionItemViewModel.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionListener.kt"
-exempted_file_path: "app/src/main/java/org/oppia/android/app/hintsandsolution/HintsViewModel.kt"
+exempted_file_path: "app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionViewModel.kt"
+exempted_file_path: "app/src/main/java/org/oppia/android/app/hintsandsolution/HintViewModel.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/hintsandsolution/ReturnToLessonViewModel.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/hintsandsolution/RevealHintListener.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/hintsandsolution/RevealSolutionDialogFragment.kt"
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 ed2fc66b2bd..a691773f494 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
@@ -26,6 +26,7 @@ import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.OPEN_QUE
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.OPEN_REVISION_CARD
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.OPEN_REVISION_TAB
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.OPEN_STORY_ACTIVITY
+import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.PAUSE_VOICE_OVER_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.PLAY_VOICE_OVER_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.REACH_INVESTED_ENGAGEMENT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.RESUME_EXPLORATION_CONTEXT
@@ -70,7 +71,6 @@ import javax.inject.Inject
 import javax.inject.Singleton
 import org.oppia.android.app.model.EventLog.CardContext as CardEventContext
 import org.oppia.android.app.model.EventLog.ConceptCardContext as ConceptCardEventContext
-import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.PAUSE_VOICE_OVER_CONTEXT
 import org.oppia.android.app.model.EventLog.ExplorationContext as ExplorationEventContext
 import org.oppia.android.app.model.EventLog.HintContext as HintEventContext
 import org.oppia.android.app.model.EventLog.LearnerDetailsContext as LearnerDetailsEventContext

From a3efa9036baa225a3593697d8b26ec9624a5f288 Mon Sep 17 00:00:00 2001
From: Ben Henning <ben@oppia.org>
Date: Wed, 18 Jan 2023 16:13:14 -0800
Subject: [PATCH 10/38] Remove TODO for soon-to-be-fixed issue.

(The intent of this issue is being tracked separately and will be
addressed on this branch in a follow-up commit).
---
 .../oppia/android/app/player/state/StateFragmentLocalTest.kt   | 3 ---
 1 file changed, 3 deletions(-)

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 796bc07f346..1b328e43be3 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
@@ -1505,9 +1505,6 @@ class StateFragmentLocalTest {
     }
   }
 
-  // TODO(#1050): Add a test for verifying that the solution is correct for non-text & non-fraction
-  //  interactions.
-
   @Test
   fun testStateFragment_stateWithNumericSolution_revealHint_reopenDialog_onlyOneHintShown() {
     launchForExploration(TEST_EXPLORATION_ID_2).use {

From 20255ecb85ec674ae6a1dcd8ed72047c102e67e6 Mon Sep 17 00:00:00 2001
From: Ben Henning <ben@oppia.org>
Date: Wed, 18 Jan 2023 17:28:33 -0800
Subject: [PATCH 11/38] Multiple fixes.

This includes:
- Post-merge fixes
- A change to make the switch lang button container transparent so that
the continue & submit buttons are still clickable through it
- A fix to work around a databinding bug that can sometimes cause a
crash that would be 100% reproducible for a specific build of the app
(since it's a bytecode-level issue)
---
 .../android/app/player/state/StateViewModel.kt | 18 +++++++++++++++---
 .../settings/profile/ProfileEditViewModel.kt   |  6 +++---
 app/src/main/res/layout/state_fragment.xml     |  4 ++--
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/oppia/android/app/player/state/StateViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/StateViewModel.kt
index 897b069014a..d15aa28ff84 100644
--- a/app/src/main/java/org/oppia/android/app/player/state/StateViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/player/state/StateViewModel.kt
@@ -24,7 +24,7 @@ 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.platformparameter.LearnerStudyAnalytics
+import org.oppia.android.util.platformparameter.EnableLearnerStudyAnalytics
 import org.oppia.android.util.platformparameter.PlatformParameterValue
 import javax.inject.Inject
 
@@ -36,7 +36,7 @@ class StateViewModel @Inject constructor(
   private val machineLocale: OppiaLocale.MachineLocale,
   private val oppiaLogger: OppiaLogger,
   private val fragment: Fragment,
-  @LearnerStudyAnalytics private val learnerStudyAnalytics: PlatformParameterValue<Boolean>
+  @EnableLearnerStudyAnalytics private val enableLearnerStudy: PlatformParameterValue<Boolean>
 ) : ObservableViewModel() {
   val itemList: ObservableList<StateItemViewModel> = ObservableArrayList()
   val rightItemList: ObservableList<StateItemViewModel> = ObservableArrayList()
@@ -49,7 +49,7 @@ class StateViewModel @Inject constructor(
   val isHintBulbVisible = ObservableField(false)
   val isHintOpenedAndUnRevealed = ObservableField(false)
 
-  val hasSupportForSwitchingToSwahili: Boolean = learnerStudyAnalytics.value
+  val hasSupportForSwitchingToSwahili: Boolean = enableLearnerStudy.value
   val hasSwahiliTranslations: LiveData<Boolean> by lazy {
     Transformations.map(
       explorationProgressController.getCurrentState().toLiveData(),
@@ -98,6 +98,18 @@ class StateViewModel @Inject constructor(
     ) ?: UserAnswer.getDefaultInstance()
   }
 
+  fun canQuicklyToggleBetweenSwahiliAndEnglish(
+    hasSwahiliTranslations: Boolean,
+    hasEnabledSwahiliTranslations: Boolean
+  ): Boolean {
+    // This logic has to be done in Kotlin since there seems to be a bug in the generated Java by
+    // the databinding compiler that can result in a NPE being thrown in code that shouldn't
+    // actually be throwing it (see https://issuetracker.google.com/issues/144246528 for context).
+    // Essentially, the following example of generated code results in an NPE unexpectedly:
+    //   Boolean value = boolean_value ? Boolean_value : false (Boolean_value can be null)
+    return hasSwahiliTranslations && hasEnabledSwahiliTranslations
+  }
+
   fun toggleContentLanguage(isSwahiliEnabled: Boolean) {
     val languageSelection = WrittenTranslationLanguageSelection.newBuilder().apply {
       selectedLanguage = if (isSwahiliEnabled) OppiaLanguage.ENGLISH else OppiaLanguage.SWAHILI
diff --git a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditViewModel.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditViewModel.kt
index c74d527c239..d7228774fae 100644
--- a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditViewModel.kt
@@ -12,7 +12,7 @@ import org.oppia.android.domain.profile.ProfileManagementController
 import org.oppia.android.util.data.AsyncResult
 import org.oppia.android.util.data.DataProviders.Companion.toLiveData
 import org.oppia.android.util.platformparameter.EnableDownloadsSupport
-import org.oppia.android.util.platformparameter.LearnerStudyAnalytics
+import org.oppia.android.util.platformparameter.EnableLearnerStudyAnalytics
 import org.oppia.android.util.platformparameter.PlatformParameterValue
 import javax.inject.Inject
 
@@ -22,7 +22,7 @@ class ProfileEditViewModel @Inject constructor(
   private val oppiaLogger: OppiaLogger,
   private val profileManagementController: ProfileManagementController,
   @EnableDownloadsSupport private val enableDownloadsSupport: PlatformParameterValue<Boolean>,
-  @LearnerStudyAnalytics private val enableLearnerStudySupport: PlatformParameterValue<Boolean>
+  @EnableLearnerStudyAnalytics private val enableLearnerStudy: PlatformParameterValue<Boolean>
 ) : ObservableViewModel() {
   private lateinit var profileId: ProfileId
 
@@ -32,7 +32,7 @@ class ProfileEditViewModel @Inject constructor(
   val isAllowedDownloadAccess: LiveData<Boolean> = isAllowedDownloadAccessMutableLiveData
 
   /** Whether the admin is allowed to mark chapters as finished. */
-  val isAllowedToMarkFinishedChapters: Boolean = enableLearnerStudySupport.value
+  val isAllowedToMarkFinishedChapters: Boolean = enableLearnerStudy.value
 
   /** List of all the current profiles registered in the app [ProfileListFragment]. */
   val profile: LiveData<Profile> by lazy {
diff --git a/app/src/main/res/layout/state_fragment.xml b/app/src/main/res/layout/state_fragment.xml
index 4fb4da44919..d0b1179d784 100755
--- a/app/src/main/res/layout/state_fragment.xml
+++ b/app/src/main/res/layout/state_fragment.xml
@@ -112,8 +112,8 @@
         android:layout_height="wrap_content"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/animable_hints_and_solution_fragment_container"
-        android:background="@color/component_color_shared_state_fragment_background_color"
-        android:visibility="@{(viewModel.hasSupportForSwitchingToSwahili &amp;&amp; viewModel.hasSwahiliTranslations) ? View.VISIBLE : View.GONE}">
+        android:background="@color/color_palette_transparent_background_color"
+        android:visibility="@{viewModel.canQuicklyToggleBetweenSwahiliAndEnglish(viewModel.hasSupportForSwitchingToSwahili, viewModel.hasSwahiliTranslations) ? View.VISIBLE : View.GONE}">
         <androidx.appcompat.widget.AppCompatButton
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"

From 62a3ab3a00062dbfd9eead10313a23ad2a6a9417 Mon Sep 17 00:00:00 2001
From: Ben Henning <ben@oppia.org>
Date: Wed, 18 Jan 2023 18:23:20 -0800
Subject: [PATCH 12/38] Fix broken titles in subtopics after conversion.

Also, clean up component_colors.xml (noticed during PR self-review) and
miscellaneous other code health adjustments.
---
 .../oppia/android/app/player/state/StateFragmentPresenter.kt  | 2 --
 app/src/main/res/values/component_colors.xml                  | 1 -
 domain/src/main/assets/GJ2rLXRKD5hw_1.json                    | 4 ++--
 domain/src/main/assets/GJ2rLXRKD5hw_2.json                    | 4 ++--
 domain/src/main/assets/GJ2rLXRKD5hw_3.json                    | 4 ++--
 domain/src/main/assets/GJ2rLXRKD5hw_4.json                    | 4 ++--
 domain/src/main/assets/omzF4oqgeTXd_1.json                    | 4 ++--
 domain/src/main/assets/test_topic_id_0_1.json                 | 4 ++--
 8 files changed, 12 insertions(+), 15 deletions(-)

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 e23f77cd9ab..725ae21d1d6 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
@@ -38,7 +38,6 @@ import org.oppia.android.app.topic.conceptcard.ConceptCardFragment.Companion.CON
 import org.oppia.android.app.translation.AppLanguageResourceHandler
 import org.oppia.android.app.utility.SplitScreenManager
 import org.oppia.android.app.utility.lifecycle.LifecycleSafeTimerFactory
-import org.oppia.android.app.viewmodel.ViewModelProvider
 import org.oppia.android.databinding.StateFragmentBinding
 import org.oppia.android.domain.exploration.ExplorationProgressController
 import org.oppia.android.domain.oppialogger.OppiaLogger
@@ -68,7 +67,6 @@ class StateFragmentPresenter @Inject constructor(
   private val fragment: Fragment,
   private val context: Context,
   private val lifecycleSafeTimerFactory: LifecycleSafeTimerFactory,
-  private val viewModelProvider: ViewModelProvider<StateViewModel>,
   private val explorationProgressController: ExplorationProgressController,
   private val storyProgressController: StoryProgressController,
   private val oppiaLogger: OppiaLogger,
diff --git a/app/src/main/res/values/component_colors.xml b/app/src/main/res/values/component_colors.xml
index 63c06aa099c..7d12d293401 100644
--- a/app/src/main/res/values/component_colors.xml
+++ b/app/src/main/res/values/component_colors.xml
@@ -84,7 +84,6 @@
   <color name="component_color_shared_navbar_header_background_color">@color/color_palette_navbar_header_background_color</color>
   <color name="component_color_shared_icon_white_color">@color/color_palette_icon_white_color</color>
   <color name="component_color_shared_icon_color">@color/color_palette_icon_color</color>
-  <color name="component_color_shared_resume_lesson_start_over_button_color">@color/color_palette_shared_resume_lesson_start_over_button_color</color>
   <!-- Themes.xml -->
   <color name="component_color_shared_activity_status_bar_color">@color/color_palette_status_bar_color</color>
   <color name="component_color_shared_fragment_status_bar_color">@color/color_palette_fragment_status_bar_color</color>
diff --git a/domain/src/main/assets/GJ2rLXRKD5hw_1.json b/domain/src/main/assets/GJ2rLXRKD5hw_1.json
index 88514dcb1f6..6202de70d1c 100644
--- a/domain/src/main/assets/GJ2rLXRKD5hw_1.json
+++ b/domain/src/main/assets/GJ2rLXRKD5hw_1.json
@@ -1,8 +1,8 @@
 {
   "topic_id": "GJ2rLXRKD5hw",
   "topic_title": {
-    "content_id": "title",
-    "html": "What is a Fraction?"
+    "content_id": "topic_title",
+    "html": "Fractions"
   },
   "page_contents": {
     "subtitled_html": {
diff --git a/domain/src/main/assets/GJ2rLXRKD5hw_2.json b/domain/src/main/assets/GJ2rLXRKD5hw_2.json
index bf9286e3b7f..6aca152f668 100644
--- a/domain/src/main/assets/GJ2rLXRKD5hw_2.json
+++ b/domain/src/main/assets/GJ2rLXRKD5hw_2.json
@@ -1,8 +1,8 @@
 {
   "topic_id": "GJ2rLXRKD5hw",
   "topic_title": {
-    "content_id": "title",
-    "html": "Fractions of a group"
+    "content_id": "topic_title",
+    "html": "Fractions"
   },
   "page_contents": {
     "subtitled_html": {
diff --git a/domain/src/main/assets/GJ2rLXRKD5hw_3.json b/domain/src/main/assets/GJ2rLXRKD5hw_3.json
index b76888b325b..34632de4b71 100644
--- a/domain/src/main/assets/GJ2rLXRKD5hw_3.json
+++ b/domain/src/main/assets/GJ2rLXRKD5hw_3.json
@@ -1,8 +1,8 @@
 {
   "topic_id": "GJ2rLXRKD5hw",
   "topic_title": {
-    "content_id": "title",
-    "html": "Mixed Numbers"
+    "content_id": "topic_title",
+    "html": "Fractions"
   },
   "page_contents": {
     "subtitled_html": {
diff --git a/domain/src/main/assets/GJ2rLXRKD5hw_4.json b/domain/src/main/assets/GJ2rLXRKD5hw_4.json
index f217358628a..f184d776b97 100644
--- a/domain/src/main/assets/GJ2rLXRKD5hw_4.json
+++ b/domain/src/main/assets/GJ2rLXRKD5hw_4.json
@@ -1,8 +1,8 @@
 {
   "topic_id": "GJ2rLXRKD5hw",
   "topic_title": {
-    "content_id": "title",
-    "html": "Adding Fractions"
+    "content_id": "topic_title",
+    "html": "Fractions"
   },
   "page_contents": {
     "subtitled_html": {
diff --git a/domain/src/main/assets/omzF4oqgeTXd_1.json b/domain/src/main/assets/omzF4oqgeTXd_1.json
index c73704d838b..0f40dbd6049 100644
--- a/domain/src/main/assets/omzF4oqgeTXd_1.json
+++ b/domain/src/main/assets/omzF4oqgeTXd_1.json
@@ -1,8 +1,8 @@
 {
   "topic_id": "omzF4oqgeTXd",
   "topic_title": {
-    "content_id": "title",
-    "html": "What is a Ratio?"
+    "content_id": "topic_title",
+    "html": "Ratios and Proportional Reasoning"
   },
   "page_contents": {
     "subtitled_html": {
diff --git a/domain/src/main/assets/test_topic_id_0_1.json b/domain/src/main/assets/test_topic_id_0_1.json
index bc6d2594c2f..ebb922a9f46 100644
--- a/domain/src/main/assets/test_topic_id_0_1.json
+++ b/domain/src/main/assets/test_topic_id_0_1.json
@@ -1,8 +1,8 @@
 {
   "topic_id": "test_topic_id_0",
   "topic_title": {
-    "content_id": "title",
-    "html": "Test subtopic"
+    "content_id": "topic_title",
+    "html": "First Test Topic"
   },
   "page_contents": {
     "subtitled_html": {

From 3a2dee05aef6bd138eaa82245038e663ee8d55f1 Mon Sep 17 00:00:00 2001
From: Ben Henning <ben@oppia.org>
Date: Wed, 18 Jan 2023 19:26:51 -0800
Subject: [PATCH 13/38] Catalog tests to add.

---
 .../MarkChaptersCompletedActivityTest.kt      |  4 ++
 .../MarkChaptersCompletedFragmentTest.kt      | 11 +++++
 .../app/player/state/StateFragmentTest.kt     |  9 +++++
 .../profile/ProfileEditFragmentTest.kt        |  5 +++
 .../player/state/StateFragmentLocalTest.kt    | 10 +++++
 .../domain/audio/AudioPlayerControllerTest.kt |  9 +++++
 .../HelpIndexExtensionsTest.kt                | 40 +++++++++++++++++++
 .../analytics/LearnerAnalyticsLoggerTest.kt   | 12 ++++++
 .../util/logging/EventBundleCreatorTest.kt    |  5 +++
 .../KenyaAlphaEventBundleCreatorTest.kt       |  5 +++
 10 files changed, 110 insertions(+)

diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedActivityTest.kt
index d37af85330e..2f2bab830c6 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedActivityTest.kt
@@ -168,6 +168,10 @@ class MarkChaptersCompletedActivityTest {
     }
   }
 
+  // TODO: Add tests
+  // - testActivity_showConfirmationTrueInIntent_selectChapters_markCompleted_confirmationShown
+  // - testActivity_showConfirmationFalseInIntent_selectChapters_markCompleted_confirmationNotShown
+
   private fun createMarkChaptersCompletedActivityIntent(internalProfileId: Int): Intent {
     return MarkChaptersCompletedActivity.createMarkChaptersCompletedIntent(
       context, internalProfileId
diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedFragmentTest.kt
index b77e89fe7ca..f23ff0abdad 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedFragmentTest.kt
@@ -752,6 +752,17 @@ class MarkChaptersCompletedFragmentTest {
     }
   }
 
+  // TODO: Add tests
+  // - testFragment_showConfirmationTrueInArgs_selectChapters_markCompleted_confirmationShown
+  // - testFragment_showConfirmationFalseInArgs_selectChapters_markCompleted_confirmationNotShown
+  // - testFragment_withNotice_selectNoChapters_markCompleted_activityClosedWithoutConfirmation
+  // - testFragment_withNotice_selectOneChapter_markCompleted_confirmationIncludesLessonTitle
+  // - testFragment_withNotice_selectTwoChapters_markCompleted_confirmationIncludesLessonTitles
+  // - testFragment_withNotice_selectThreeChapters_markCompleted_confirmationIncludesLessonTitles
+  // - testFragment_withNotice_selectChapters_markCompleted_cancelConfirmation_activityStillOpen
+  // - testFragment_withNotice_selectChapters_markCompleted_confirmSelection_activityClosed
+  // - testFragment_withNotice_selectChapters_markCompleted_confirmSelection_expsMarkedAsDone
+
   private fun createMarkChaptersCompletedTestActivityIntent(internalProfileId: Int): Intent {
     return MarkChaptersCompletedTestActivity.createMarkChaptersCompletedTestIntent(
       context, internalProfileId
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 37f1297f1c5..b30e7cc574a 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
@@ -2417,6 +2417,15 @@ class StateFragmentTest {
     }
   }
 
+  // TODO: Add tests
+  // - testStateFragment_studyOff_inEnglish_doesNotHaveSwitchToSwahiliButton
+  // - testStateFragment_studyOn_inEnglish_lessonWithoutSwahili_doesNotHaveSwitchToSwahiliButton
+  // - testStateFragment_studyOn_inEnglish_hasSwitchToSwahiliButton
+  // - testStateFragment_studyOn_inSwahili_hasSwitchToEnglishButton
+  // - testStateFragment_inEnglish_clickSwitchToSwahili_contentIsInSwahili
+  // - testStateFragment_inSwahili_clickSwitchToEnglish_contentIsInEnglish
+  // - testStateFragment_inEnglish_clickSwitchToSwahili_thenBackToEnglish_contentIsInEnglish
+
   @Test
   fun testStateFragment_mathInteractions_numericExp_matchesExactly_canSubmitCorrectAnswer() {
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
diff --git a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditFragmentTest.kt
index 34793c91e79..f7140672f8f 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditFragmentTest.kt
@@ -381,6 +381,11 @@ class ProfileEditFragmentTest {
     }
   }
 
+  // TODO: Add tests.
+  // - testProfileEdit_studyOff_doesNotHaveMarkChaptersCompletedButton
+  // - testProfileEdit_studyOn_hasMarkChaptersCompletedButton
+  // - testProfileEdit_studyOn_clickMarkChapsCompleted_opensMarkCompleteActivityForProfile (include verifying the notice)
+
   @Singleton
   @Component(
     modules = [
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 1b328e43be3..fd7371f227b 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
@@ -1554,6 +1554,16 @@ class StateFragmentLocalTest {
     }
   }
 
+  // TODO: Add tests
+  // - testStateFragment_stateWithFractionInput_showSolution_exclusive_solutionHasCorrectAnswerText
+  // - testStateFragment_stateWithNumericInput_showSolution_exclusive_solutionHasCorrectAnswerText
+  // - testStateFragment_stateWithTextInput_showSolution_exclusive_solutionHasCorrectAnswerText
+  // - testStateFragment_stateWithRatioInput_showSolution_notExclusive_solutionHasCorrectAnswerText
+  // - testStateFragment_stateWithNumericExpr_showSolution_solutionHasCorrectHtmlAnswerText
+  // - testStateFragment_stateWithNumericExpr_showSolution_solutionHasCorrectAnswerContentDescription
+  // - testStateFragment_stateWithAlgebraicExpr_showSolution_solutionHasCorrectHtmlAnswerText
+  // - testStateFragment_stateWithAlgebraicEq_showSolution_solutionHasCorrectHtmlAnswerText
+
   @Test
   @DefineAppLanguageLocaleContext(
     oppiaLanguageEnumId = ENGLISH_VALUE,
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 b09af657b80..8d67957c36d 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
@@ -617,6 +617,15 @@ class AudioPlayerControllerTest {
     assertThat(fakeAnalyticsEventLogger.noEventsPresent()).isTrue()
   }
 
+  // TODO: add/update tests
+  // - Update tests above to include verification for language code.
+  // - testPause_playing_explicitUserAction_studyOn_logsPauseEvent
+  // - testPause_playing_explicitAction_missingContentId_studyOn_logsPauseEventWithoutContentId
+  // - testPause_playing_explicitUserAction_outsideExp_studyOn_doesNotLogEvent
+  // - testPause_playing_notExplicitUserAction_studyOn_doesNotLogEvent
+  // - testPause_notPlaying_explicitUserAction_studyOn_doesNotLogEvent
+  // - testPause_notPlaying_notExplicitUserAction_studyOn_doesNotLogEvent
+
   private fun arrangeMediaPlayer(contentId: String? = null) {
     audioPlayerController.initializeMediaPlayer().observeForever(mockAudioPlayerObserver)
     audioPlayerController.changeDataSource(TEST_URL, contentId)
diff --git a/domain/src/test/java/org/oppia/android/domain/hintsandsolution/HelpIndexExtensionsTest.kt b/domain/src/test/java/org/oppia/android/domain/hintsandsolution/HelpIndexExtensionsTest.kt
index a18f846f451..76e10344496 100644
--- a/domain/src/test/java/org/oppia/android/domain/hintsandsolution/HelpIndexExtensionsTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/hintsandsolution/HelpIndexExtensionsTest.kt
@@ -225,6 +225,46 @@ class HelpIndexExtensionsTest {
     assertThat(hintIsRevealed).isFalse()
   }
 
+  // TODO: Add tests.
+  // - testDropLastUnavailable_defaultHelpIndex_emptyList_returnsEmptyList
+  // - testDropLastUnavailable_defaultHelpIndex_nonEmptyList_returnsEmptyList
+  // - testDropLastUnavailable_availableHintIndex0_emptyList_returnsEmptyList
+  // - testDropLastUnavailable_availableHintIndex0_singletonList_returnsSingletonList
+  // - testDropLastUnavailable_availableHintIndex0_twoHintsList_returnsSingletonList
+  // - testDropLastUnavailable_availableHintIndex1_emptyList_returnsEmptyList
+  // - testDropLastUnavailable_availableHintIndex1_singletonList_returnsSingletonList
+  // - testDropLastUnavailable_availableHintIndex1_twoHintsList_returnsTwoItemList
+  // - testDropLastUnavailable_availableHintIndex1_threeHintsList_returnsTwoItemList
+  // - testDropLastUnavailable_lastRevealedHintIndex0_emptyList_returnsEmptyList
+  // - testDropLastUnavailable_lastRevealedHintIndex0_singletonList_returnsSingletonList
+  // - testDropLastUnavailable_lastRevealedHintIndex0_twoHintsList_returnsSingletonList
+  // - testDropLastUnavailable_lastRevealedHintIndex1_emptyList_returnsEmptyList
+  // - testDropLastUnavailable_lastRevealedHintIndex1_singletonList_returnsSingletonList
+  // - testDropLastUnavailable_lastRevealedHintIndex1_twoHintsList_returnsTwoItemList
+  // - testDropLastUnavailable_lastRevealedHintIndex1_threeHintsList_returnsTwoItemList
+  // - testDropLastUnavailable_showSolution_emptyList_returnsEmptyList
+  // - testDropLastUnavailable_showSolution_singletonList_returnsSingletonList
+  // - testDropLastUnavailable_showSolution_twoHintsList_returnsTwoHintsList
+  // - testDropLastUnavailable_showSolution_emptyList_returnsEmptyList
+  // - testDropLastUnavailable_showSolution_singletonList_returnsSingletonList
+  // - testDropLastUnavailable_showSolution_twoHintsList_returnsTwoItemList
+  // - testDropLastUnavailable_showSolution_threeHintsList_returnsThreeItemList
+  // - testDropLastUnavailable_everythingRevealed_emptyList_returnsEmptyList
+  // - testDropLastUnavailable_everythingRevealed_singletonList_returnsSingletonList
+  // - testDropLastUnavailable_everythingRevealed_twoHintsList_returnsTwoHintsList
+  // - testDropLastUnavailable_everythingRevealed_emptyList_returnsEmptyList
+  // - testDropLastUnavailable_everythingRevealed_singletonList_returnsSingletonList
+  // - testDropLastUnavailable_everythingRevealed_twoHintsList_returnsTwoItemList
+  // - testDropLastUnavailable_everythingRevealed_threeHintsList_returnsThreeItemList
+  //
+  // - testIsSolutionAvailable_defaultHelpIndex_returnsFalse
+  // - testIsSolutionAvailable_availableHint0_returnsFalse
+  // - testIsSolutionAvailable_availableHint1_returnsFalse
+  // - testIsSolutionAvailable_viewedHint0_returnsFalse
+  // - testIsSolutionAvailable_viewedHint1_returnsFalse
+  // - testIsSolutionAvailable_showSolution_returnsTrue
+  // - testIsSolutionAvailable_everythingIsRevealed_returnsTrue
+
   @Test
   fun testIsSolutionRevealed_defaultHelpIndex_returnsFalse() {
     val helpIndex = HelpIndex.getDefaultInstance()
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 1b950ebe901..096de313e6e 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
@@ -924,6 +924,14 @@ class LearnerAnalyticsLoggerTest {
     assertThat(eventLog).hasPlayVoiceOverContextThat().hasContentIdThat().isEmpty()
   }
 
+  // TODO: Add tests.
+  // - Update testStateAnalyticsLogger_logPlayVoiceOver_logsStateEventWithContentId & testStateAnalyticsLogger_logPlayVoiceOver_diffContentId_logsStateEventWithContentId to include language codes.
+  // - testStateAnalyticsLogger_logPlayVoiceOver_nullLanguageCode_logsStateEventWithoutLanguageCode
+  // - testStateAnalyticsLogger_logPauseVoiceOver_logsStateEventWithContentId
+  // - testStateAnalyticsLogger_logPauseVoiceOver_diffContentId_logsStateEventWithContentId
+  // - testStateAnalyticsLogger_logPauseVoiceOver_nullContentId_logsStateEventWithoutContentId
+  // - testStateAnalyticsLogger_logPauseVoiceOver_nullLanguageCode_logsStateEventWithoutLanguageCode
+
   @Test
   @RunParameterized(
     Iteration("no_install_id", "lid=learn", "iid=null", "elid=learn", "eid="),
@@ -1400,6 +1408,10 @@ class LearnerAnalyticsLoggerTest {
     assertThat(log.type).isEqualTo(Log.ERROR)
   }
 
+  // TODO: Add tests.
+  // - testStateAnalyticsLogger_logPauseVoiceOver_missingOneId_logsEventWithMissingId (parameterized)
+  // - testStateAnalyticsLogger_logPauseVoiceOver_noInstallOrLearnerIds_logsEventAndConsoleErrors
+
   @Test
   fun testStateAnalyticsLogger_logReachInvestedEngagement_logsStateEventWithStateName() {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
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 1a99a5ed0a7..a76990246c1 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
@@ -1139,6 +1139,11 @@ class EventBundleCreatorTest {
     assertThat(bundle).string("ed_ld_install_id").isEqualTo(TEST_INSTALLATION_ID)
   }
 
+  // TODO: Add tests.
+  // - Update all "studyOn" cases to match the new one below.
+  // - testFillEventBundle_pauseVoiceOverEvent_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName
+  // - testFillEventBundle_pauseVoiceOverEvent_studyOn_fillsAllFieldsAndReturnsName
+
   @Test
   fun testFillEventBundle_appInBackgroundEvent_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName() {
     setUpTestApplicationComponentWithoutLearnerAnalyticsStudy()
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 b63b7440831..387e0998f59 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
@@ -794,6 +794,11 @@ class KenyaAlphaEventBundleCreatorTest {
     assertThat(bundle).string("ed_ld_install_id").isEqualTo(TEST_INSTALLATION_ID)
   }
 
+  // TODO: Add tests.
+  // - Update all "studyOn" cases to match the new one below.
+  // - testFillEventBundle_pauseVoiceOverEvent_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName
+  // - testFillEventBundle_pauseVoiceOverEvent_studyOn_fillsAllFieldsAndReturnsName
+
   @Test
   fun testFillEventBundle_appInBackgroundEvent_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName() {
     setUpTestApplicationComponentWithoutLearnerAnalyticsStudy()

From c40d89bed8d6450fbe2575c28ae4cf044aa9be13 Mon Sep 17 00:00:00 2001
From: Ben Henning <ben@oppia.org>
Date: Wed, 18 Jan 2023 20:06:24 -0800
Subject: [PATCH 14/38] Fix test build breakages.

---
 .../MarkChaptersCompletedActivityTest.kt      |  2 +-
 .../NavigationDrawerActivityDebugTest.kt      |  2 +-
 .../domain/audio/AudioPlayerControllerTest.kt | 32 +++++++++----------
 .../ExplorationProgressControllerTest.kt      |  4 +--
 .../analytics/LearnerAnalyticsLoggerTest.kt   | 21 ++++++------
 ...uestionAssessmentProgressControllerTest.kt |  6 ++--
 .../testing/logging/EventLogSubject.kt        |  8 +++++
 7 files changed, 42 insertions(+), 33 deletions(-)

diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedActivityTest.kt
index 2f2bab830c6..f961372dc48 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedActivityTest.kt
@@ -174,7 +174,7 @@ class MarkChaptersCompletedActivityTest {
 
   private fun createMarkChaptersCompletedActivityIntent(internalProfileId: Int): Intent {
     return MarkChaptersCompletedActivity.createMarkChaptersCompletedIntent(
-      context, internalProfileId
+      context, internalProfileId, showConfirmationNotice = false
     )
   }
 
diff --git a/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerActivityDebugTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerActivityDebugTest.kt
index 07310792522..602671fb84b 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerActivityDebugTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerActivityDebugTest.kt
@@ -317,7 +317,7 @@ class NavigationDrawerActivityDebugTest {
       intended(hasComponent(DeveloperOptionsActivity::class.java.name))
       intended(
         hasExtra(
-          DeveloperOptionsActivity.getIntentKey(),
+          "NavigationDrawerFragmentPresenter.navigation_profile_id",
           internalProfileId
         )
       )
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 8d67957c36d..34fa43f2ca4 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
@@ -115,7 +115,7 @@ class AudioPlayerControllerTest {
   fun testController_initializePlayer_invokePrepared_reportsSuccessfulInit() {
     setUpMediaReadyApplication()
     audioPlayerController.initializeMediaPlayer()
-    audioPlayerController.changeDataSource(TEST_URL, contentId = null)
+    audioPlayerController.changeDataSource(TEST_URL, contentId = null, languageCode = "en")
 
     shadowMediaPlayer.invokePreparedListener()
 
@@ -138,7 +138,7 @@ class AudioPlayerControllerTest {
     setUpMediaReadyApplication()
     arrangeMediaPlayer()
 
-    audioPlayerController.pause()
+    audioPlayerController.pause(isFromExplicitUserAction = true)
 
     assertThat(shadowMediaPlayer.isReallyPlaying).isFalse()
   }
@@ -182,7 +182,7 @@ class AudioPlayerControllerTest {
 
     audioPlayerController.releaseMediaPlayer()
     audioPlayerController.initializeMediaPlayer().observeForever(mockAudioPlayerObserver)
-    audioPlayerController.changeDataSource(TEST_URL, contentId = null)
+    audioPlayerController.changeDataSource(TEST_URL, contentId = null, languageCode = "en")
 
     verify(mockAudioPlayerObserver, atLeastOnce()).onChanged(audioPlayerResultCaptor.capture())
     assertThat(audioPlayerResultCaptor.value).isPending()
@@ -207,7 +207,7 @@ class AudioPlayerControllerTest {
     setUpMediaReadyApplication()
     arrangeMediaPlayer()
 
-    audioPlayerController.changeDataSource(TEST_URL2, contentId = null)
+    audioPlayerController.changeDataSource(TEST_URL2, contentId = null, languageCode = "en")
 
     verify(mockAudioPlayerObserver, atLeastOnce()).onChanged(audioPlayerResultCaptor.capture())
     assertThat(audioPlayerResultCaptor.value).isPending()
@@ -219,7 +219,7 @@ class AudioPlayerControllerTest {
     arrangeMediaPlayer()
 
     audioPlayerController.play(isPlayingFromAutoPlay = false, reloadingMainContent = false)
-    audioPlayerController.changeDataSource(TEST_URL2, contentId = null)
+    audioPlayerController.changeDataSource(TEST_URL2, contentId = null, languageCode = "en")
 
     verify(mockAudioPlayerObserver, atLeastOnce()).onChanged(audioPlayerResultCaptor.capture())
     assertThat(audioPlayerResultCaptor.value).isPending()
@@ -269,7 +269,7 @@ class AudioPlayerControllerTest {
     arrangeMediaPlayer()
 
     audioPlayerController.play(isPlayingFromAutoPlay = false, reloadingMainContent = false)
-    audioPlayerController.pause()
+    audioPlayerController.pause(isFromExplicitUserAction = true)
 
     verify(mockAudioPlayerObserver, atLeastOnce()).onChanged(audioPlayerResultCaptor.capture())
     assertThat(audioPlayerResultCaptor.value).hasSuccessValueWhere {
@@ -323,7 +323,7 @@ class AudioPlayerControllerTest {
     arrangeMediaPlayer()
 
     audioPlayerController.seekTo(500)
-    audioPlayerController.changeDataSource(TEST_URL2, contentId = null)
+    audioPlayerController.changeDataSource(TEST_URL2, contentId = null, languageCode = "en")
     shadowMediaPlayer.invokePreparedListener()
     audioPlayerController.play(isPlayingFromAutoPlay = false, reloadingMainContent = false)
 
@@ -355,7 +355,7 @@ class AudioPlayerControllerTest {
 
     audioPlayerController.play(isPlayingFromAutoPlay = false, reloadingMainContent = false)
     testCoroutineDispatchers.advanceTimeBy(500) // Play part of the audio track before pausing.
-    audioPlayerController.pause()
+    audioPlayerController.pause(isFromExplicitUserAction = true)
     testCoroutineDispatchers.advanceTimeBy(2000)
 
     verify(mockAudioPlayerObserver, atLeastOnce()).onChanged(audioPlayerResultCaptor.capture())
@@ -386,7 +386,7 @@ class AudioPlayerControllerTest {
   fun testScheduling_observeData_removeObserver_verifyTestDoesNotHang() {
     setUpMediaReadyApplication()
     val playProgress = audioPlayerController.initializeMediaPlayer()
-    audioPlayerController.changeDataSource(TEST_URL, contentId = null)
+    audioPlayerController.changeDataSource(TEST_URL, contentId = null, languageCode = "en")
     testCoroutineDispatchers.runCurrent()
 
     playProgress.observeForever(mockAudioPlayerObserver)
@@ -402,13 +402,13 @@ class AudioPlayerControllerTest {
     setUpMediaReadyApplication()
     val playProgress =
       audioPlayerController.initializeMediaPlayer()
-    audioPlayerController.changeDataSource(TEST_URL, contentId = null)
+    audioPlayerController.changeDataSource(TEST_URL, contentId = null, languageCode = "en")
     testCoroutineDispatchers.runCurrent()
 
     audioPlayerController.play(isPlayingFromAutoPlay = false, reloadingMainContent = false)
     testCoroutineDispatchers.advanceTimeBy(2000)
     playProgress.observeForever(mockAudioPlayerObserver)
-    audioPlayerController.pause()
+    audioPlayerController.pause(isFromExplicitUserAction = true)
     playProgress.removeObserver(mockAudioPlayerObserver)
     audioPlayerController.play(isPlayingFromAutoPlay = false, reloadingMainContent = false)
 
@@ -419,7 +419,7 @@ class AudioPlayerControllerTest {
   fun testController_invokeErrorListener_invokePrepared_verifyAudioStatusIsFailure() {
     setUpMediaReadyApplication()
     audioPlayerController.initializeMediaPlayer().observeForever(mockAudioPlayerObserver)
-    audioPlayerController.changeDataSource(TEST_URL, contentId = null)
+    audioPlayerController.changeDataSource(TEST_URL, contentId = null, languageCode = "en")
 
     shadowMediaPlayer.invokeErrorListener(/* what= */ 0, /* extra= */ 0)
     shadowMediaPlayer.invokePreparedListener()
@@ -453,7 +453,7 @@ class AudioPlayerControllerTest {
   fun testError_notPrepared_invokePause_fails() {
     setUpMediaReadyApplication()
     val exception = assertThrows(IllegalStateException::class) {
-      audioPlayerController.pause()
+      audioPlayerController.pause(isFromExplicitUserAction = true)
     }
 
     assertThat(exception).hasMessageThat().contains("Media Player not in a prepared state")
@@ -473,7 +473,7 @@ class AudioPlayerControllerTest {
   fun testController_initializePlayer_invokePrepared_reportsFailure_logsException() {
     setUpMediaReadyApplication()
     audioPlayerController.initializeMediaPlayer()
-    audioPlayerController.changeDataSource(TEST_FAIL_URL, contentId = null)
+    audioPlayerController.changeDataSource(TEST_FAIL_URL, contentId = null, languageCode = "en")
 
     shadowMediaPlayer.invokePreparedListener()
     val exception = fakeExceptionLogger.getMostRecentException()
@@ -626,9 +626,9 @@ class AudioPlayerControllerTest {
   // - testPause_notPlaying_explicitUserAction_studyOn_doesNotLogEvent
   // - testPause_notPlaying_notExplicitUserAction_studyOn_doesNotLogEvent
 
-  private fun arrangeMediaPlayer(contentId: String? = null) {
+  private fun arrangeMediaPlayer(contentId: String? = null, languageCode: String = "en") {
     audioPlayerController.initializeMediaPlayer().observeForever(mockAudioPlayerObserver)
-    audioPlayerController.changeDataSource(TEST_URL, contentId)
+    audioPlayerController.changeDataSource(TEST_URL, contentId, languageCode)
     shadowMediaPlayer.invokePreparedListener()
     testCoroutineDispatchers.runCurrent()
   }
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 0b79d5604a4..b8369a6bcf2 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
@@ -848,8 +848,8 @@ class ExplorationProgressControllerTest {
     val hint = ephemeralState.state.interaction.getHint(0)
     assertThat(hint.hintContent.html).contains("Remember that two halves")
     val solution = ephemeralState.state.interaction.solution
-    assertThat(solution.correctAnswer.numerator).isEqualTo(1)
-    assertThat(solution.correctAnswer.denominator).isEqualTo(2)
+    assertThat(solution.correctAnswer.fraction.numerator).isEqualTo(1)
+    assertThat(solution.correctAnswer.fraction.denominator).isEqualTo(2)
     assertThat(solution.explanation.html)
       .contains("Half of something has one part in the numerator for every two parts")
   }
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 096de313e6e..59d3c4550b6 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
@@ -872,12 +872,12 @@ class LearnerAnalyticsLoggerTest {
   }
 
   @Test
-  fun testStateAnalyticsLogger_logPlayVoiceOver_logsStateEventWithContentId() {
+  fun testStateAnalyticsLogger_logPlayVoiceOver_logsStateEventWithContentIdAndLangugaeCode() {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
     val stateLogger = expLogger.startCard(exploration5.getStateByName(TEST_EXP_5_STATE_THREE_NAME))
 
-    stateLogger.logPlayVoiceOver(contentId = "test_content_id_1")
+    stateLogger.logPlayVoiceOver(contentId = "test_content_id_1", languageCode = "en")
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
@@ -895,20 +895,22 @@ class LearnerAnalyticsLoggerTest {
         }
       }
       hasContentIdThat().isEqualTo("test_content_id_1")
+      hasLanguageCodeThat().isEqualTo("en")
     }
   }
 
   @Test
-  fun testStateAnalyticsLogger_logPlayVoiceOver_diffContentId_logsStateEventWithContentId() {
+  fun testStateAnalyticsLogger_logPlayVoiceOver_diffContentId_logsStateEventWithContentIdAndLang() {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
     val stateLogger = expLogger.startCard(exploration5.getStateByName(TEST_EXP_5_STATE_THREE_NAME))
 
-    stateLogger.logPlayVoiceOver(contentId = "content_id_2")
+    stateLogger.logPlayVoiceOver(contentId = "content_id_2", languageCode = "sw")
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
     assertThat(eventLog).hasPlayVoiceOverContextThat().hasContentIdThat().isEqualTo("content_id_2")
+    assertThat(eventLog).hasPlayVoiceOverContextThat().hasLanguageCodeThat().isEqualTo("sw")
   }
 
   @Test
@@ -917,7 +919,7 @@ class LearnerAnalyticsLoggerTest {
     val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
     val stateLogger = expLogger.startCard(exploration5.getStateByName(TEST_EXP_5_STATE_THREE_NAME))
 
-    stateLogger.logPlayVoiceOver(contentId = null)
+    stateLogger.logPlayVoiceOver(contentId = null, languageCode = "en")
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
@@ -925,10 +927,9 @@ class LearnerAnalyticsLoggerTest {
   }
 
   // TODO: Add tests.
-  // - Update testStateAnalyticsLogger_logPlayVoiceOver_logsStateEventWithContentId & testStateAnalyticsLogger_logPlayVoiceOver_diffContentId_logsStateEventWithContentId to include language codes.
   // - testStateAnalyticsLogger_logPlayVoiceOver_nullLanguageCode_logsStateEventWithoutLanguageCode
-  // - testStateAnalyticsLogger_logPauseVoiceOver_logsStateEventWithContentId
-  // - testStateAnalyticsLogger_logPauseVoiceOver_diffContentId_logsStateEventWithContentId
+  // - testStateAnalyticsLogger_logPauseVoiceOver_logsStateEventWithContentIdAndLanguageCode
+  // - testStateAnalyticsLogger_logPauseVoiceOver_diffContentId_logsStateEventWithContentIdAndLang
   // - testStateAnalyticsLogger_logPauseVoiceOver_nullContentId_logsStateEventWithoutContentId
   // - testStateAnalyticsLogger_logPauseVoiceOver_nullLanguageCode_logsStateEventWithoutLanguageCode
 
@@ -1378,7 +1379,7 @@ class LearnerAnalyticsLoggerTest {
       )
     val stateLogger = expLogger.startCard(exploration5.getStateByName(exploration5.initStateName))
 
-    stateLogger.logPlayVoiceOver(contentId = "test_content_id_1")
+    stateLogger.logPlayVoiceOver(contentId = "test_content_id_1", languageCode = "en")
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasPlayVoiceOverContextThat {
@@ -1398,7 +1399,7 @@ class LearnerAnalyticsLoggerTest {
       learnerAnalyticsLogger.beginExploration(exploration5, learnerId = null, installationId = null)
     val stateLogger = expLogger.startCard(exploration5.getStateByName(exploration5.initStateName))
 
-    stateLogger.logPlayVoiceOver(contentId = "test_content_id_1")
+    stateLogger.logPlayVoiceOver(contentId = "test_content_id_1", languageCode = "en")
 
     // See testExpLogger_logExitExploration_noInstallOrLearnerIds_logsEventAndConsoleErrors.
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
diff --git a/domain/src/test/java/org/oppia/android/domain/question/QuestionAssessmentProgressControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/question/QuestionAssessmentProgressControllerTest.kt
index b3bf0235e28..a66b9f2e5cc 100644
--- a/domain/src/test/java/org/oppia/android/domain/question/QuestionAssessmentProgressControllerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/question/QuestionAssessmentProgressControllerTest.kt
@@ -695,7 +695,7 @@ class QuestionAssessmentProgressControllerTest {
     assertThat(currentQuestion.ephemeralState.pendingState.wrongAnswerCount).isEqualTo(3)
 
     val hintAndSolution = currentQuestion.ephemeralState.state.interaction.solution
-    assertThat(hintAndSolution.correctAnswer.correctAnswer).contains("1/4")
+    assertThat(hintAndSolution.correctAnswer.normalizedString).contains("1/4")
 
     monitorFactory.waitForNextSuccessfulResult(
       questionAssessmentProgressController.submitSolutionIsRevealed()
@@ -1518,7 +1518,7 @@ class QuestionAssessmentProgressControllerTest {
 
   private fun viewSolutionForQuestion2(ephemeralQuestion: EphemeralQuestion) {
     val solution = ephemeralQuestion.ephemeralState.state.interaction.solution
-    assertThat(solution.correctAnswer.correctAnswer).isEqualTo("3.0")
+    assertThat(solution.correctAnswer.normalizedString).isEqualTo("3.0")
     monitorFactory.waitForNextSuccessfulResult(
       questionAssessmentProgressController.submitSolutionIsRevealed()
     )
@@ -1534,7 +1534,7 @@ class QuestionAssessmentProgressControllerTest {
 
   private fun viewSolutionForQuestion3(ephemeralQuestion: EphemeralQuestion) {
     val solution = ephemeralQuestion.ephemeralState.state.interaction.solution
-    assertThat(solution.correctAnswer.correctAnswer).isEqualTo("1/2")
+    assertThat(solution.correctAnswer.normalizedString).isEqualTo("1/2")
     monitorFactory.waitForNextSuccessfulResult(
       questionAssessmentProgressController.submitSolutionIsRevealed()
     )
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 5d57cf754f1..eaa5931e8ab 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
@@ -1089,6 +1089,14 @@ class EventLogSubject private constructor(
      */
     fun hasContentIdThat(): StringSubject = assertThat(actual.contentId)
 
+    /**
+     * Returns a [StringSubject] to test [EventLog.PlayVoiceOverContext.getLanguageCode].
+     *
+     * This method never fails since the underlying property defaults to empty string if it's not
+     * defined in the context.
+     */
+    fun hasLanguageCodeThat(): StringSubject = assertThat(actual.languageCode)
+
     companion object {
       /**
        * Returns a new [PlayVoiceOverContextSubject] to verify aspects of the specified

From 87cd1063bc42b230910b9bbf7e82118c7efdcea6 Mon Sep 17 00:00:00 2001
From: Ben Henning <ben@oppia.org>
Date: Thu, 19 Jan 2023 14:17:46 -0800
Subject: [PATCH 15/38] Fix test functional breakages.

---
 .../exploration/ExplorationActivityTest.kt       |  3 ++-
 .../oppia/android/app/story/StoryFragmentTest.kt | 12 ++++++------
 .../app/player/state/StateFragmentLocalTest.kt   |  2 +-
 domain/src/main/assets/MjZzEVOG47_1.json         |  2 +-
 domain/src/main/assets/MjZzEVOG47_1.textproto    |  1 -
 domain/src/main/assets/questions.json            | 10 ++++++++--
 domain/src/main/assets/questions.textproto       |  2 +-
 domain/src/main/assets/skills.json               |  2 +-
 domain/src/main/assets/skills.textproto          |  2 +-
 .../test_checkpointing_base_exploration.json     |  9 +--------
 ...test_checkpointing_base_exploration.textproto |  4 ----
 ..._exploration_multiple_compatible_updates.json |  9 +--------
 ...oration_multiple_compatible_updates.textproto |  4 ----
 ...ration_multiple_updates_one_incompatible.json |  9 +--------
 ...n_multiple_updates_one_incompatible.textproto |  4 ----
 ...test_checkpointing_exploration_new_title.json |  9 +--------
 ...checkpointing_exploration_new_title.textproto |  4 ----
 ...st_checkpointing_exploration_new_version.json |  9 +--------
 ...eckpointing_exploration_new_version.textproto |  4 ----
 ...ion_updated_first_state_compat_rule_spec.json |  9 +--------
 ...pdated_first_state_compat_rule_spec.textproto |  4 ----
 ...on_updated_first_state_correctness_label.json |  9 +--------
 ...dated_first_state_correctness_label.textproto |  4 ----
 ...loration_updated_first_state_destination.json |  9 +--------
 ...ion_updated_first_state_destination.textproto |  4 ----
 ...ration_updated_first_state_feedback_html.json |  9 +--------
 ...n_updated_first_state_feedback_html.textproto |  4 ----
 ...loration_updated_first_state_feedback_id.json |  9 +--------
 ...ion_updated_first_state_feedback_id.textproto |  4 ----
 ...n_updated_first_state_incompat_rule_spec.json |  9 +--------
 ...ated_first_state_incompat_rule_spec.textproto |  4 ----
 ...n_updated_first_state_new_correct_answer.json |  9 +--------
 ...ated_first_state_new_correct_answer.textproto |  4 ----
 ...ration_updated_first_state_updated_hints.json |  9 +--------
 ...n_updated_first_state_updated_hints.textproto |  4 ----
 ...exploration_updated_second_state_removed.json |  9 +--------
 ...ration_updated_second_state_removed.textproto |  4 ----
 .../android/domain/topic/TopicController.kt      | 16 ++++++++++++----
 .../oppia/android/domain/util/StateRetriever.kt  |  4 +++-
 .../QuestionAssessmentProgressControllerTest.kt  |  2 +-
 .../util/logging/EventBundleCreatorTest.kt       | 11 ++++++++---
 .../logging/KenyaAlphaEventBundleCreatorTest.kt  | 11 ++++++++---
 42 files changed, 67 insertions(+), 195 deletions(-)

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 c7a14e337e8..b36ee9eaf25 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
@@ -1925,12 +1925,13 @@ class ExplorationActivityTest {
       pressRevealHintButton(hintPosition = 0)
 
       // Ensure the hint description is correct and doesn't contain any HTML.
+      // TODO: File an issue for the broken content description rendering from HTML (needs more work & needs to be generically).
       onView(withId(R.id.hints_and_solution_summary))
         .check(
           matches(
             withContentDescription(
               "Remember that two halves, when added together," +
-                " make one whole.\n\n"
+                " make one whole.\n\nClick on this .\n\n"
             )
           )
         )
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 f30d3ddb461..296206bb6e3 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
@@ -449,9 +449,9 @@ class StoryFragmentTest {
       ).check(
         matches(
           withText(
-            "Learning about oppia app in First Story. It is very long " +
-              "but it has to be fully visible. You wil be learning about Oppia interactions. " +
-              "There is no second story to follow-up, but there is a second chapter."
+            "This is the outline/summary for the first exploration of the story. It is very long" +
+              " but it has to be fully visible. You wil be learning about Oppia interactions." +
+              " There is no second story to follow-up, but there is a second chapter."
           )
         )
       )
@@ -477,9 +477,9 @@ class StoryFragmentTest {
       ).check(
         matches(
           withText(
-            "Learning about oppia app in First Story. It is very long " +
-              "but it has to be fully visible. You wil be learning about Oppia interactions. " +
-              "There is no second story to follow-up, but there is a second chapter."
+            "This is the outline/summary for the first exploration of the story. It is very long" +
+              " but it has to be fully visible. You wil be learning about Oppia interactions." +
+              " There is no second story to follow-up, but there is a second chapter."
           )
         )
       )
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 fd7371f227b..6f029137f01 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
@@ -1277,7 +1277,7 @@ class StateFragmentLocalTest {
         .perform(click())
       testCoroutineDispatchers.runCurrent()
 
-      onView(withText("This will reveal the solution. Are you sure?"))
+      onView(withText("This will show the solution. Are you sure?"))
         .inRoot(isDialog())
         .check(matches(isDisplayed()))
     }
diff --git a/domain/src/main/assets/MjZzEVOG47_1.json b/domain/src/main/assets/MjZzEVOG47_1.json
index c4ac2fe7e1d..8bcb805c8a6 100644
--- a/domain/src/main/assets/MjZzEVOG47_1.json
+++ b/domain/src/main/assets/MjZzEVOG47_1.json
@@ -2710,7 +2710,7 @@
               "dest": "Matthew gets conned",
               "feedback": {
                 "content_id": "feedback_1",
-                "html": "<p>Yes, that's right -- congratulations, you figured out Crumb's trick!</p><p>Let's see what happens to Matthew, though...</p>"
+                "html": ""
               },
               "labelled_as_correct": true,
               "param_changes": [],
diff --git a/domain/src/main/assets/MjZzEVOG47_1.textproto b/domain/src/main/assets/MjZzEVOG47_1.textproto
index 5222ac203d1..cbb4a840172 100644
--- a/domain/src/main/assets/MjZzEVOG47_1.textproto
+++ b/domain/src/main/assets/MjZzEVOG47_1.textproto
@@ -3402,7 +3402,6 @@ states {
         outcome {
           dest_state_name: "Matthew gets conned"
           feedback {
-            html: "<p>Yes, that\'s right -- congratulations, you figured out Crumb\'s trick!</p><p>Let\'s see what happens to Matthew, though...</p>"
             content_id: "feedback_1"
           }
           labelled_as_correct: true
diff --git a/domain/src/main/assets/questions.json b/domain/src/main/assets/questions.json
index 99765433509..b57ea294e3f 100644
--- a/domain/src/main/assets/questions.json
+++ b/domain/src/main/assets/questions.json
@@ -1897,7 +1897,13 @@
       },
       "written_translations": {
         "translations_mapping": {
-          "content": {},
+          "content": {
+            "ar": {
+              "data_format": "html",
+              "translation": { "translation": "<p> إذا تحدثنا عن الرغبة في 4/7 من الكعكة ، فماذا يمثل السبعة؟ </p>" },
+              "needs_update": false
+            }
+          },
           "solution": {},
           "feedback_1": {},
           "ca_choices_0": {},
@@ -1968,7 +1974,7 @@
         "solution": {
           "answer_is_exclusive": false,
           "correct_answer": {
-            "normalized_string": "3.0"
+            "real": 3.0
           },
           "explanation": {
             "content_id": "solution",
diff --git a/domain/src/main/assets/questions.textproto b/domain/src/main/assets/questions.textproto
index b099995f6f9..68934418056 100644
--- a/domain/src/main/assets/questions.textproto
+++ b/domain/src/main/assets/questions.textproto
@@ -2639,7 +2639,7 @@ questions {
           content_id: "solution"
         }
         correct_answer {
-          normalized_string: "3.0"
+          real: 3.0
         }
       }
       hint {
diff --git a/domain/src/main/assets/skills.json b/domain/src/main/assets/skills.json
index f432aca77eb..7ed926a457c 100644
--- a/domain/src/main/assets/skills.json
+++ b/domain/src/main/assets/skills.json
@@ -145,7 +145,7 @@
     "skill_contents": {
       "explanation": {
         "content_id": "explanation",
-        "html": "Explanation with <b>rich text</b>."
+        "html": "Explanation with <b>rich text</b>.<p>Click on this <oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;test_skill_id_0&amp;quot;\" text-with-value=\"&amp;quot;test_skill_id_0 concept card&amp;quot;\"></oppia-noninteractive-skillreview>.</p>"
       },
       "worked_examples": [{
         "question": {
diff --git a/domain/src/main/assets/skills.textproto b/domain/src/main/assets/skills.textproto
index 997aa4b0238..44f0765e187 100644
--- a/domain/src/main/assets/skills.textproto
+++ b/domain/src/main/assets/skills.textproto
@@ -170,7 +170,7 @@ concept_cards {
   skill_id: "test_skill_id_1"
   skill_description: "Another important skill"
   explanation {
-    html: "Explanation with <b>rich text</b>."
+    html: "Explanation with <b>rich text</b>.<p>Click on this <oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;test_skill_id_0&amp;quot;\" text-with-value=\"&amp;quot;test_skill_id_0 concept card&amp;quot;\"></oppia-noninteractive-skillreview>.</p>"
     content_id: "explanation"
   }
   worked_example {
diff --git a/domain/src/main/assets/test_checkpointing_base_exploration.json b/domain/src/main/assets/test_checkpointing_base_exploration.json
index f9f8a236523..4e489a6966b 100644
--- a/domain/src/main/assets/test_checkpointing_base_exploration.json
+++ b/domain/src/main/assets/test_checkpointing_base_exploration.json
@@ -74,14 +74,7 @@
               "html": "PI can be approximated to 3 correct digits by computing 22/7."
             }
           }],
-          "solution": {
-            "answer_is_exclusive": false,
-            "correct_answer": "",
-            "explanation": {
-              "content_id": "",
-              "html": ""
-            }
-          }
+          "solution": null
         },
         "classifier_model_id": "",
         "recorded_voiceovers": {
diff --git a/domain/src/main/assets/test_checkpointing_base_exploration.textproto b/domain/src/main/assets/test_checkpointing_base_exploration.textproto
index 388553d871a..c689b1ec263 100644
--- a/domain/src/main/assets/test_checkpointing_base_exploration.textproto
+++ b/domain/src/main/assets/test_checkpointing_base_exploration.textproto
@@ -46,10 +46,6 @@ states {
           rule_type: "Equals"
         }
       }
-      solution {
-        explanation {
-        }
-      }
       hint {
         hint_content {
           html: "PI can be approximated to 3 correct digits by computing 22/7."
diff --git a/domain/src/main/assets/test_checkpointing_exploration_multiple_compatible_updates.json b/domain/src/main/assets/test_checkpointing_exploration_multiple_compatible_updates.json
index 8be896ca831..57218d36f80 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_multiple_compatible_updates.json
+++ b/domain/src/main/assets/test_checkpointing_exploration_multiple_compatible_updates.json
@@ -79,14 +79,7 @@
               "html": "PI can be approximated to 6 correct digits by computing 355/113."
             }
           }],
-          "solution": {
-            "answer_is_exclusive": false,
-            "correct_answer": "",
-            "explanation": {
-              "content_id": "",
-              "html": ""
-            }
-          }
+          "solution": null
         },
         "classifier_model_id": "",
         "recorded_voiceovers": {
diff --git a/domain/src/main/assets/test_checkpointing_exploration_multiple_compatible_updates.textproto b/domain/src/main/assets/test_checkpointing_exploration_multiple_compatible_updates.textproto
index e174cbe449e..6f86e1abae4 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_multiple_compatible_updates.textproto
+++ b/domain/src/main/assets/test_checkpointing_exploration_multiple_compatible_updates.textproto
@@ -46,10 +46,6 @@ states {
           rule_type: "Equals"
         }
       }
-      solution {
-        explanation {
-        }
-      }
       hint {
         hint_content {
           html: "PI can be approximated to 3 correct digits by computing 22/7."
diff --git a/domain/src/main/assets/test_checkpointing_exploration_multiple_updates_one_incompatible.json b/domain/src/main/assets/test_checkpointing_exploration_multiple_updates_one_incompatible.json
index 64b2d8bba7a..ac1293173b2 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_multiple_updates_one_incompatible.json
+++ b/domain/src/main/assets/test_checkpointing_exploration_multiple_updates_one_incompatible.json
@@ -84,14 +84,7 @@
               "html": "PI can be approximated to 6 correct digits by computing 355/113."
             }
           }],
-          "solution": {
-            "answer_is_exclusive": false,
-            "correct_answer": "",
-            "explanation": {
-              "content_id": "",
-              "html": ""
-            }
-          }
+          "solution": null
         },
         "classifier_model_id": "",
         "recorded_voiceovers": {
diff --git a/domain/src/main/assets/test_checkpointing_exploration_multiple_updates_one_incompatible.textproto b/domain/src/main/assets/test_checkpointing_exploration_multiple_updates_one_incompatible.textproto
index 0ba22cdb68c..491288b290c 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_multiple_updates_one_incompatible.textproto
+++ b/domain/src/main/assets/test_checkpointing_exploration_multiple_updates_one_incompatible.textproto
@@ -55,10 +55,6 @@ states {
           rule_type: "Equals"
         }
       }
-      solution {
-        explanation {
-        }
-      }
       hint {
         hint_content {
           html: "PI can be approximated to 3 correct digits by computing 22/7."
diff --git a/domain/src/main/assets/test_checkpointing_exploration_new_title.json b/domain/src/main/assets/test_checkpointing_exploration_new_title.json
index a7c01a49e79..bdcf1f9cb74 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_new_title.json
+++ b/domain/src/main/assets/test_checkpointing_exploration_new_title.json
@@ -74,14 +74,7 @@
               "html": "PI can be approximated to 3 correct digits by computing 22/7."
             }
           }],
-          "solution": {
-            "answer_is_exclusive": false,
-            "correct_answer": "",
-            "explanation": {
-              "content_id": "",
-              "html": ""
-            }
-          }
+          "solution": null
         },
         "classifier_model_id": "",
         "recorded_voiceovers": {
diff --git a/domain/src/main/assets/test_checkpointing_exploration_new_title.textproto b/domain/src/main/assets/test_checkpointing_exploration_new_title.textproto
index c63330b1bed..358b66b71f0 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_new_title.textproto
+++ b/domain/src/main/assets/test_checkpointing_exploration_new_title.textproto
@@ -46,10 +46,6 @@ states {
           rule_type: "Equals"
         }
       }
-      solution {
-        explanation {
-        }
-      }
       hint {
         hint_content {
           html: "PI can be approximated to 3 correct digits by computing 22/7."
diff --git a/domain/src/main/assets/test_checkpointing_exploration_new_version.json b/domain/src/main/assets/test_checkpointing_exploration_new_version.json
index d46173ea9b2..24d948eab3f 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_new_version.json
+++ b/domain/src/main/assets/test_checkpointing_exploration_new_version.json
@@ -74,14 +74,7 @@
               "html": "PI can be approximated to 3 correct digits by computing 22/7."
             }
           }],
-          "solution": {
-            "answer_is_exclusive": false,
-            "correct_answer": "",
-            "explanation": {
-              "content_id": "",
-              "html": ""
-            }
-          }
+          "solution": null
         },
         "classifier_model_id": "",
         "recorded_voiceovers": {
diff --git a/domain/src/main/assets/test_checkpointing_exploration_new_version.textproto b/domain/src/main/assets/test_checkpointing_exploration_new_version.textproto
index e3468ba0f3a..185b31d646a 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_new_version.textproto
+++ b/domain/src/main/assets/test_checkpointing_exploration_new_version.textproto
@@ -46,10 +46,6 @@ states {
           rule_type: "Equals"
         }
       }
-      solution {
-        explanation {
-        }
-      }
       hint {
         hint_content {
           html: "PI can be approximated to 3 correct digits by computing 22/7."
diff --git a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_compat_rule_spec.json b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_compat_rule_spec.json
index 18ca40c20ce..499371faf4d 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_compat_rule_spec.json
+++ b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_compat_rule_spec.json
@@ -75,14 +75,7 @@
               "html": "PI can be approximated to 3 correct digits by computing 22/7."
             }
           }],
-          "solution": {
-            "answer_is_exclusive": false,
-            "correct_answer": "",
-            "explanation": {
-              "content_id": "",
-              "html": ""
-            }
-          }
+          "solution": null
         },
         "classifier_model_id": "",
         "recorded_voiceovers": {
diff --git a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_compat_rule_spec.textproto b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_compat_rule_spec.textproto
index c372ac9d1eb..a7c96576e49 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_compat_rule_spec.textproto
+++ b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_compat_rule_spec.textproto
@@ -52,10 +52,6 @@ states {
           rule_type: "Equals"
         }
       }
-      solution {
-        explanation {
-        }
-      }
       hint {
         hint_content {
           html: "PI can be approximated to 3 correct digits by computing 22/7."
diff --git a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_correctness_label.json b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_correctness_label.json
index fa2d7b7f619..899e91c56fc 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_correctness_label.json
+++ b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_correctness_label.json
@@ -74,14 +74,7 @@
               "html": "PI can be approximated to 3 correct digits by computing 22/7."
             }
           }],
-          "solution": {
-            "answer_is_exclusive": false,
-            "correct_answer": "",
-            "explanation": {
-              "content_id": "",
-              "html": ""
-            }
-          }
+          "solution": null
         },
         "classifier_model_id": "",
         "recorded_voiceovers": {
diff --git a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_correctness_label.textproto b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_correctness_label.textproto
index bb8f4b675af..6919ac60315 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_correctness_label.textproto
+++ b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_correctness_label.textproto
@@ -45,10 +45,6 @@ states {
           rule_type: "Equals"
         }
       }
-      solution {
-        explanation {
-        }
-      }
       hint {
         hint_content {
           html: "PI can be approximated to 3 correct digits by computing 22/7."
diff --git a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_destination.json b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_destination.json
index fd4e8bab32a..be5ff43aa04 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_destination.json
+++ b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_destination.json
@@ -74,14 +74,7 @@
               "html": "PI can be approximated to 3 correct digits by computing 22/7."
             }
           }],
-          "solution": {
-            "answer_is_exclusive": false,
-            "correct_answer": "",
-            "explanation": {
-              "content_id": "",
-              "html": ""
-            }
-          }
+          "solution": null
         },
         "classifier_model_id": "",
         "recorded_voiceovers": {
diff --git a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_destination.textproto b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_destination.textproto
index e4a1b9b8770..0bc552514f1 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_destination.textproto
+++ b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_destination.textproto
@@ -46,10 +46,6 @@ states {
           rule_type: "Equals"
         }
       }
-      solution {
-        explanation {
-        }
-      }
       hint {
         hint_content {
           html: "PI can be approximated to 3 correct digits by computing 22/7."
diff --git a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_feedback_html.json b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_feedback_html.json
index 37fe84ebaae..c1469abdafb 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_feedback_html.json
+++ b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_feedback_html.json
@@ -74,14 +74,7 @@
               "html": "PI can be approximated to 3 correct digits by computing 22/7."
             }
           }],
-          "solution": {
-            "answer_is_exclusive": false,
-            "correct_answer": "",
-            "explanation": {
-              "content_id": "",
-              "html": ""
-            }
-          }
+          "solution": null
         },
         "classifier_model_id": "",
         "recorded_voiceovers": {
diff --git a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_feedback_html.textproto b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_feedback_html.textproto
index f165aebb4da..d9034cdf582 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_feedback_html.textproto
+++ b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_feedback_html.textproto
@@ -46,10 +46,6 @@ states {
           rule_type: "Equals"
         }
       }
-      solution {
-        explanation {
-        }
-      }
       hint {
         hint_content {
           html: "PI can be approximated to 3 correct digits by computing 22/7."
diff --git a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_feedback_id.json b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_feedback_id.json
index 4cbfde41faa..55d86af4b46 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_feedback_id.json
+++ b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_feedback_id.json
@@ -74,14 +74,7 @@
               "html": "PI can be approximated to 3 correct digits by computing 22/7."
             }
           }],
-          "solution": {
-            "answer_is_exclusive": false,
-            "correct_answer": "",
-            "explanation": {
-              "content_id": "",
-              "html": ""
-            }
-          }
+          "solution": null
         },
         "classifier_model_id": "",
         "recorded_voiceovers": {
diff --git a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_feedback_id.textproto b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_feedback_id.textproto
index bc646719bdd..f6ad7e9d53a 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_feedback_id.textproto
+++ b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_feedback_id.textproto
@@ -46,10 +46,6 @@ states {
           rule_type: "Equals"
         }
       }
-      solution {
-        explanation {
-        }
-      }
       hint {
         hint_content {
           html: "PI can be approximated to 3 correct digits by computing 22/7."
diff --git a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_incompat_rule_spec.json b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_incompat_rule_spec.json
index 8fc11afd6ee..99f62125a13 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_incompat_rule_spec.json
+++ b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_incompat_rule_spec.json
@@ -75,14 +75,7 @@
               "html": "PI can be approximated to 3 correct digits by computing 22/7."
             }
           }],
-          "solution": {
-            "answer_is_exclusive": false,
-            "correct_answer": "",
-            "explanation": {
-              "content_id": "",
-              "html": ""
-            }
-          }
+          "solution": null
         },
         "classifier_model_id": "",
         "recorded_voiceovers": {
diff --git a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_incompat_rule_spec.textproto b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_incompat_rule_spec.textproto
index 2d577e632db..53f43859616 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_incompat_rule_spec.textproto
+++ b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_incompat_rule_spec.textproto
@@ -52,10 +52,6 @@ states {
           rule_type: "Equals"
         }
       }
-      solution {
-        explanation {
-        }
-      }
       hint {
         hint_content {
           html: "PI can be approximated to 3 correct digits by computing 22/7."
diff --git a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_new_correct_answer.json b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_new_correct_answer.json
index 48a1838268e..1843bb49f1b 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_new_correct_answer.json
+++ b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_new_correct_answer.json
@@ -79,14 +79,7 @@
               "html": "PI can be approximated to 3 correct digits by computing 22/7."
             }
           }],
-          "solution": {
-            "answer_is_exclusive": false,
-            "correct_answer": "",
-            "explanation": {
-              "content_id": "",
-              "html": ""
-            }
-          }
+          "solution": null
         },
         "classifier_model_id": "",
         "recorded_voiceovers": {
diff --git a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_new_correct_answer.textproto b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_new_correct_answer.textproto
index 8bd110938c6..2e3e359236c 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_new_correct_answer.textproto
+++ b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_new_correct_answer.textproto
@@ -55,10 +55,6 @@ states {
           rule_type: "Equals"
         }
       }
-      solution {
-        explanation {
-        }
-      }
       hint {
         hint_content {
           html: "PI can be approximated to 3 correct digits by computing 22/7."
diff --git a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_updated_hints.json b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_updated_hints.json
index 1bd620cc0d5..623be2c1bc9 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_updated_hints.json
+++ b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_updated_hints.json
@@ -79,14 +79,7 @@
               "html": "PI can be approximated to 6 correct digits by computing 355/113."
             }
           }],
-          "solution": {
-            "answer_is_exclusive": false,
-            "correct_answer": "",
-            "explanation": {
-              "content_id": "",
-              "html": ""
-            }
-          }
+          "solution": null
         },
         "classifier_model_id": "",
         "recorded_voiceovers": {
diff --git a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_updated_hints.textproto b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_updated_hints.textproto
index 60f7bb230d7..72580271cce 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_updated_hints.textproto
+++ b/domain/src/main/assets/test_checkpointing_exploration_updated_first_state_updated_hints.textproto
@@ -46,10 +46,6 @@ states {
           rule_type: "Equals"
         }
       }
-      solution {
-        explanation {
-        }
-      }
       hint {
         hint_content {
           html: "PI can be approximated to 3 correct digits by computing 22/7."
diff --git a/domain/src/main/assets/test_checkpointing_exploration_updated_second_state_removed.json b/domain/src/main/assets/test_checkpointing_exploration_updated_second_state_removed.json
index 1e8dfbf9d07..ff1b2cec5da 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_updated_second_state_removed.json
+++ b/domain/src/main/assets/test_checkpointing_exploration_updated_second_state_removed.json
@@ -74,14 +74,7 @@
               "html": "PI can be approximated to 3 correct digits by computing 22/7."
             }
           }],
-          "solution": {
-            "answer_is_exclusive": false,
-            "correct_answer": "",
-            "explanation": {
-              "content_id": "",
-              "html": ""
-            }
-          }
+          "solution": null
         },
         "classifier_model_id": "",
         "recorded_voiceovers": {
diff --git a/domain/src/main/assets/test_checkpointing_exploration_updated_second_state_removed.textproto b/domain/src/main/assets/test_checkpointing_exploration_updated_second_state_removed.textproto
index 55ee7552f17..0c0ba7faee5 100644
--- a/domain/src/main/assets/test_checkpointing_exploration_updated_second_state_removed.textproto
+++ b/domain/src/main/assets/test_checkpointing_exploration_updated_second_state_removed.textproto
@@ -46,10 +46,6 @@ states {
           rule_type: "Equals"
         }
       }
-      solution {
-        explanation {
-        }
-      }
       hint {
         hint_content {
           html: "PI can be approximated to 3 correct digits by computing 22/7."
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 8f3fede9d75..64c22d4e7af 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
@@ -602,7 +602,7 @@ class TopicController @Inject constructor(
       }
       val subtopicTitle = SubtitledHtml.newBuilder().apply {
         contentId = "title"
-        html = currentSubtopicJsonObject.optString("title") ?: ""
+        html = currentSubtopicJsonObject.getRemovableOptionalString("title") ?: ""
       }.build()
       // No written translations are included since none are retrieved from JSON.
       val subtopic = Subtopic.newBuilder()
@@ -703,7 +703,7 @@ class TopicController @Inject constructor(
     val storyDataJsonObject = jsonAssetRetriever.loadJsonFromAsset("$storyId.json")
     val storyTitle = SubtitledHtml.newBuilder().apply {
       contentId = "title"
-      html = storyDataJsonObject?.optString("story_title") ?: ""
+      html = storyDataJsonObject?.getRemovableOptionalString("story_title") ?: ""
     }.build()
     val chapterList = storyDataJsonObject?.getJSONArray("story_nodes")?.let {
       createChaptersFromJson(it)
@@ -751,11 +751,11 @@ class TopicController @Inject constructor(
       val explorationId = chapter.getStringFromObject("exploration_id")
       val chapterTitle = SubtitledHtml.newBuilder().apply {
         contentId = "title"
-        html = chapter.optString("title") ?: ""
+        html = chapter.getRemovableOptionalString("title") ?: ""
       }.build()
       val chapterDescription = SubtitledHtml.newBuilder().apply {
         contentId = "description"
-        html = chapter.optString("description") ?: ""
+        html = chapter.getFirstRemovableOptionalString("description", "outline") ?: ""
       }.build()
       // No written translations are included since none are retrieved from JSON.
       chapterList.add(
@@ -919,4 +919,12 @@ class TopicController @Inject constructor(
         )
     }.build()
   }
+
+  private companion object {
+    private fun JSONObject.getRemovableOptionalString(name: String) =
+      optString(name).takeIf { it.isNotEmpty() && it != "<removed>" && it != "<unknown>" }
+
+    private fun JSONObject.getFirstRemovableOptionalString(vararg names: String) =
+      names.asSequence().map { getRemovableOptionalString(it) }.firstOrNull { it != null }
+  }
 }
diff --git a/domain/src/main/java/org/oppia/android/domain/util/StateRetriever.kt b/domain/src/main/java/org/oppia/android/domain/util/StateRetriever.kt
index ec411290f38..f6450d4a0f8 100644
--- a/domain/src/main/java/org/oppia/android/domain/util/StateRetriever.kt
+++ b/domain/src/main/java/org/oppia/android/domain/util/StateRetriever.kt
@@ -55,7 +55,9 @@ class StateRetriever @Inject constructor() {
           createWrittenTranslationMappingsFromJson(stateJson.getJSONObject("written_translations"))
         )
       }
-      stateJson.optString("linked_skill_id")?.let { linkedSkillId = it }
+      stateJson.optString("linked_skill_id").takeIf {
+        it.isNotEmpty() && it != "null"
+      }?.let { linkedSkillId = it }
     }.build()
 
   // Creates an interaction from JSON
diff --git a/domain/src/test/java/org/oppia/android/domain/question/QuestionAssessmentProgressControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/question/QuestionAssessmentProgressControllerTest.kt
index a66b9f2e5cc..f5aad0432a1 100644
--- a/domain/src/test/java/org/oppia/android/domain/question/QuestionAssessmentProgressControllerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/question/QuestionAssessmentProgressControllerTest.kt
@@ -1518,7 +1518,7 @@ class QuestionAssessmentProgressControllerTest {
 
   private fun viewSolutionForQuestion2(ephemeralQuestion: EphemeralQuestion) {
     val solution = ephemeralQuestion.ephemeralState.state.interaction.solution
-    assertThat(solution.correctAnswer.normalizedString).isEqualTo("3.0")
+    assertThat(solution.correctAnswer.real).isWithin(1e-5).of(3.0)
     monitorFactory.waitForNextSuccessfulResult(
       questionAssessmentProgressController.submitSolutionIsRevealed()
     )
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 a76990246c1..04897cedf45 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
@@ -133,6 +133,7 @@ class EventBundleCreatorTest {
     private const val TEST_IS_ANSWER_CORRECT = true
     private const val TEST_IS_ANSWER_CORRECT_STR = "true"
     private const val TEST_CONTENT_ID = "test_content_id"
+    private const val TEST_LANGUAGE_CODE = "en"
     private const val TEST_APP_VERSION_NAME = "oppia-android-test-0123456789"
     private const val TEST_APP_VERSION_CODE = 125
     private const val TEST_CPU_USAGE = Double.MAX_VALUE
@@ -1096,7 +1097,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("click_play_voiceover_button")
-    assertThat(bundle).hasSize(13)
+    assertThat(bundle).hasSize(14)
     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)
@@ -1110,6 +1111,7 @@ class EventBundleCreatorTest {
     assertThat(bundle).string("ed_exploration_version").isEqualTo(TEST_EXPLORATION_VERSION_STR)
     assertThat(bundle).string("ed_state_name").isEqualTo(TEST_STATE_NAME)
     assertThat(bundle).string("content_id").isEqualTo(TEST_CONTENT_ID)
+    assertThat(bundle).string("language_code").isEqualTo(TEST_LANGUAGE_CODE)
   }
 
   @Test
@@ -1121,7 +1123,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("click_play_voiceover_button")
-    assertThat(bundle).hasSize(15)
+    assertThat(bundle).hasSize(16)
     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)
@@ -1135,6 +1137,7 @@ class EventBundleCreatorTest {
     assertThat(bundle).string("ed_exploration_version").isEqualTo(TEST_EXPLORATION_VERSION_STR)
     assertThat(bundle).string("ed_state_name").isEqualTo(TEST_STATE_NAME)
     assertThat(bundle).string("content_id").isEqualTo(TEST_CONTENT_ID)
+    assertThat(bundle).string("language_code").isEqualTo(TEST_LANGUAGE_CODE)
     assertThat(bundle).string("ed_ld_learner_id").isEqualTo(TEST_LEARNER_ID)
     assertThat(bundle).string("ed_ld_install_id").isEqualTo(TEST_INSTALLATION_ID)
   }
@@ -1925,10 +1928,12 @@ class EventBundleCreatorTest {
 
   private fun createPlayVoiceOverContextDetails(
     explorationDetails: ExplorationContext = createExplorationContext(),
-    contentId: String = TEST_CONTENT_ID
+    contentId: String = TEST_CONTENT_ID,
+    languageCode: String = TEST_LANGUAGE_CODE
   ) = PlayVoiceOverContext.newBuilder().apply {
     this.explorationDetails = explorationDetails
     this.contentId = contentId
+    this.languageCode = languageCode
   }.build()
 
   private fun registerTestApplication() {
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 387e0998f59..4664fd4d837 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
@@ -106,6 +106,7 @@ class KenyaAlphaEventBundleCreatorTest {
     private const val TEST_IS_ANSWER_CORRECT = true
     private const val TEST_IS_ANSWER_CORRECT_STR = "true"
     private const val TEST_CONTENT_ID = "test_content_id"
+    private const val TEST_LANGUAGE_CODE = "en"
     private const val TEST_APP_VERSION_NAME = "oppia-android-test-0123456789"
     private const val TEST_APP_VERSION_CODE = 125
   }
@@ -751,7 +752,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("play_voice_over_context")
-    assertThat(bundle).hasSize(13)
+    assertThat(bundle).hasSize(14)
     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)
@@ -765,6 +766,7 @@ class KenyaAlphaEventBundleCreatorTest {
     assertThat(bundle).string("ed_exploration_version").isEqualTo(TEST_EXPLORATION_VERSION_STR)
     assertThat(bundle).string("ed_state_name").isEqualTo(TEST_STATE_NAME)
     assertThat(bundle).string("content_id").isEqualTo(TEST_CONTENT_ID)
+    assertThat(bundle).string("language_code").isEqualTo(TEST_LANGUAGE_CODE)
   }
 
   @Test
@@ -776,7 +778,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("play_voice_over_context")
-    assertThat(bundle).hasSize(15)
+    assertThat(bundle).hasSize(16)
     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)
@@ -790,6 +792,7 @@ class KenyaAlphaEventBundleCreatorTest {
     assertThat(bundle).string("ed_exploration_version").isEqualTo(TEST_EXPLORATION_VERSION_STR)
     assertThat(bundle).string("ed_state_name").isEqualTo(TEST_STATE_NAME)
     assertThat(bundle).string("content_id").isEqualTo(TEST_CONTENT_ID)
+    assertThat(bundle).string("language_code").isEqualTo(TEST_LANGUAGE_CODE)
     assertThat(bundle).string("ed_ld_learner_id").isEqualTo(TEST_LEARNER_ID)
     assertThat(bundle).string("ed_ld_install_id").isEqualTo(TEST_INSTALLATION_ID)
   }
@@ -1355,10 +1358,12 @@ class KenyaAlphaEventBundleCreatorTest {
 
   private fun createPlayVoiceOverContextDetails(
     explorationDetails: ExplorationContext = createExplorationContext(),
-    contentId: String = TEST_CONTENT_ID
+    contentId: String = TEST_CONTENT_ID,
+    languageCode: String = TEST_LANGUAGE_CODE
   ) = PlayVoiceOverContext.newBuilder().apply {
     this.explorationDetails = explorationDetails
     this.contentId = contentId
+    this.languageCode = languageCode
   }.build()
 
   private fun registerTestApplication() {

From 598a00cc21f24262949e8b3594b5e212f78ab889 Mon Sep 17 00:00:00 2001
From: Ben Henning <ben@oppia.org>
Date: Thu, 19 Jan 2023 21:54:54 -0800
Subject: [PATCH 16/38] Add new tests.

Also, fix a few issues that the new tests discovered.
---
 .../MarkChaptersCompletedFragmentPresenter.kt |   2 +-
 .../MarkChaptersCompletedTestActivity.kt      |  20 +-
 .../app/player/state/StateViewModel.kt        |   7 +-
 app/src/main/res/layout/solution_summary.xml  |   1 +
 app/src/main/res/layout/state_fragment.xml    |   4 +-
 .../MarkChaptersCompletedActivityTest.kt      |  93 +++-
 .../MarkChaptersCompletedFragmentTest.kt      | 517 ++++++++++++------
 .../app/player/state/StateFragmentTest.kt     | 392 +++++++++++--
 .../profile/ProfileEditFragmentTest.kt        |  70 ++-
 .../player/state/StateFragmentLocalTest.kt    | 378 ++++++++++---
 .../domain/audio/AudioPlayerControllerTest.kt | 123 ++++-
 .../HelpIndexExtensionsTest.kt                | 442 +++++++++++++--
 .../analytics/LearnerAnalyticsLoggerTest.kt   | 131 ++++-
 .../assets/kdoc_validity_exemptions.textproto |   1 -
 .../testing/logging/EventLogSubject.kt        |  27 +
 .../util/logging/EventBundleCreatorTest.kt    | 106 +++-
 .../KenyaAlphaEventBundleCreatorTest.kt       | 106 +++-
 17 files changed, 1979 insertions(+), 441 deletions(-)

diff --git a/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedFragmentPresenter.kt
index 98b5440f534..98a5d8f35fc 100644
--- a/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedFragmentPresenter.kt
@@ -106,7 +106,7 @@ class MarkChaptersCompletedFragmentPresenter @Inject constructor(
     }
 
     binding.markChaptersCompletedMarkCompletedTextView.setOnClickListener {
-      if (showConfirmationNotice) {
+      if (showConfirmationNotice && this.selectedExplorationIds.isNotEmpty()) {
         showConfirmationDialog()
       } else markChaptersAsCompleted()
     }
diff --git a/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/testing/MarkChaptersCompletedTestActivity.kt b/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/testing/MarkChaptersCompletedTestActivity.kt
index 5b854a4c25d..2cd8e78e37d 100644
--- a/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/testing/MarkChaptersCompletedTestActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/testing/MarkChaptersCompletedTestActivity.kt
@@ -10,19 +10,18 @@ import org.oppia.android.app.devoptions.markchapterscompleted.MarkChaptersComple
 
 /** The activity for testing [MarkChaptersCompletedFragment]. */
 class MarkChaptersCompletedTestActivity : InjectableAppCompatActivity() {
-
-  private var internalProfileId = -1
-
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     (activityComponent as ActivityComponentImpl).inject(this)
     supportActionBar?.setDisplayHomeAsUpEnabled(true)
     supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_arrow_back_white_24dp)
     setContentView(R.layout.mark_chapters_completed_activity)
-    internalProfileId = intent.getIntExtra(PROFILE_ID_EXTRA_KEY, -1)
+    val internalProfileId = intent.getIntExtra(PROFILE_ID_EXTRA_KEY, /* default= */ -1)
+    val showConfirmationNotice =
+      intent.getBooleanExtra(SHOW_CONFIRMATION_NOTICE_EXTRA_KEY, /* default= */ false)
     if (getMarkChaptersCompletedFragment() == null) {
       val markChaptersCompletedFragment =
-        MarkChaptersCompletedFragment.newInstance(internalProfileId, showConfirmationNotice = false)
+        MarkChaptersCompletedFragment.newInstance(internalProfileId, showConfirmationNotice)
       supportFragmentManager.beginTransaction().add(
         R.id.mark_chapters_completed_container,
         markChaptersCompletedFragment
@@ -36,12 +35,19 @@ class MarkChaptersCompletedTestActivity : InjectableAppCompatActivity() {
   }
 
   companion object {
-    const val PROFILE_ID_EXTRA_KEY = "MarkChaptersCompletedTestActivity.profile_id"
+    private const val PROFILE_ID_EXTRA_KEY = "MarkChaptersCompletedTestActivity.profile_id"
+    private const val SHOW_CONFIRMATION_NOTICE_EXTRA_KEY =
+      "MarkChaptersCompletedTestActivity.show_confirmation_notice"
 
     /** Returns an [Intent] for [MarkChaptersCompletedTestActivity]. */
-    fun createMarkChaptersCompletedTestIntent(context: Context, internalProfileId: Int): Intent {
+    fun createMarkChaptersCompletedTestIntent(
+      context: Context,
+      internalProfileId: Int,
+      showConfirmationNotice: Boolean
+    ): Intent {
       val intent = Intent(context, MarkChaptersCompletedTestActivity::class.java)
       intent.putExtra(PROFILE_ID_EXTRA_KEY, internalProfileId)
+      intent.putExtra(SHOW_CONFIRMATION_NOTICE_EXTRA_KEY, showConfirmationNotice)
       return intent
     }
   }
diff --git a/app/src/main/java/org/oppia/android/app/player/state/StateViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/StateViewModel.kt
index d15aa28ff84..c41e987c35d 100644
--- a/app/src/main/java/org/oppia/android/app/player/state/StateViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/player/state/StateViewModel.kt
@@ -98,16 +98,13 @@ class StateViewModel @Inject constructor(
     ) ?: UserAnswer.getDefaultInstance()
   }
 
-  fun canQuicklyToggleBetweenSwahiliAndEnglish(
-    hasSwahiliTranslations: Boolean,
-    hasEnabledSwahiliTranslations: Boolean
-  ): Boolean {
+  fun canQuicklyToggleBetweenSwahiliAndEnglish(hasSwahiliTranslations: Boolean): Boolean {
     // This logic has to be done in Kotlin since there seems to be a bug in the generated Java by
     // the databinding compiler that can result in a NPE being thrown in code that shouldn't
     // actually be throwing it (see https://issuetracker.google.com/issues/144246528 for context).
     // Essentially, the following example of generated code results in an NPE unexpectedly:
     //   Boolean value = boolean_value ? Boolean_value : false (Boolean_value can be null)
-    return hasSwahiliTranslations && hasEnabledSwahiliTranslations
+    return hasSwahiliTranslations && hasSupportForSwitchingToSwahili
   }
 
   fun toggleContentLanguage(isSwahiliEnabled: Boolean) {
diff --git a/app/src/main/res/layout/solution_summary.xml b/app/src/main/res/layout/solution_summary.xml
index e9c776b7212..568719128c3 100644
--- a/app/src/main/res/layout/solution_summary.xml
+++ b/app/src/main/res/layout/solution_summary.xml
@@ -139,6 +139,7 @@
             android:layout_height="wrap_content"
             android:fontFamily="sans-serif"
             android:textColor="@color/component_color_hints_and_solutions_fragment_description_color"
+            android:contentDescription="@{viewModel.correctAnswerContentDescription}"
             android:textSize="16sp" />
 
           <LinearLayout
diff --git a/app/src/main/res/layout/state_fragment.xml b/app/src/main/res/layout/state_fragment.xml
index d0b1179d784..d097ae065c6 100755
--- a/app/src/main/res/layout/state_fragment.xml
+++ b/app/src/main/res/layout/state_fragment.xml
@@ -108,13 +108,15 @@
       android:clipToPadding="false"
       android:paddingTop="24dp">
       <FrameLayout
+        android:id="@+id/quick_switch_exploration_language_button_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/animable_hints_and_solution_fragment_container"
         android:background="@color/color_palette_transparent_background_color"
-        android:visibility="@{viewModel.canQuicklyToggleBetweenSwahiliAndEnglish(viewModel.hasSupportForSwitchingToSwahili, viewModel.hasSwahiliTranslations) ? View.VISIBLE : View.GONE}">
+        android:visibility="@{viewModel.canQuicklyToggleBetweenSwahiliAndEnglish(viewModel.hasSwahiliTranslations) ? View.VISIBLE : View.GONE}">
         <androidx.appcompat.widget.AppCompatButton
+          android:id="@+id/quick_switch_exploration_language_button"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           style="@style/SecondaryButton"
diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedActivityTest.kt
index f961372dc48..10dcf9c0890 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedActivityTest.kt
@@ -4,17 +4,25 @@ import android.app.Application
 import android.content.Context
 import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import androidx.test.core.app.ActivityScenario.launch
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions.doesNotExist
 import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.contrib.RecyclerViewActions.scrollToPosition
+import androidx.test.espresso.matcher.RootMatchers.isDialog
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.isRoot
 import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.rule.ActivityTestRule
 import com.google.common.truth.Truth.assertThat
 import dagger.Component
+import org.hamcrest.CoreMatchers.containsString
+import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -32,6 +40,7 @@ import org.oppia.android.app.application.testing.TestingBuildFlavorModule
 import org.oppia.android.app.devoptions.markchapterscompleted.MarkChaptersCompletedActivity
 import org.oppia.android.app.model.ScreenName
 import org.oppia.android.app.player.state.itemviewmodel.SplitScreenInteractionModule
+import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView
 import org.oppia.android.app.shim.ViewBindingShimModule
 import org.oppia.android.app.translation.testing.ActivityRecreatorTestModule
 import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape
@@ -70,6 +79,7 @@ import org.oppia.android.testing.OppiaTestRule
 import org.oppia.android.testing.TestLogReportingModule
 import org.oppia.android.testing.junit.InitializeDefaultLocaleRule
 import org.oppia.android.testing.robolectric.RobolectricModule
+import org.oppia.android.testing.threading.TestCoroutineDispatchers
 import org.oppia.android.testing.threading.TestDispatcherModule
 import org.oppia.android.testing.time.FakeOppiaClockModule
 import org.oppia.android.util.accessibility.AccessibilityTestModule
@@ -100,13 +110,8 @@ import javax.inject.Singleton
   qualifiers = "port-xxhdpi"
 )
 class MarkChaptersCompletedActivityTest {
-  @get:Rule
-  val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
-
-  private val internalProfileId = 0
-
-  @Inject
-  lateinit var context: Context
+  @get:Rule val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
+  @get:Rule val oppiaTestRule = OppiaTestRule()
 
   @get:Rule
   val activityTestRule = ActivityTestRule(
@@ -115,12 +120,20 @@ class MarkChaptersCompletedActivityTest {
     /* launchActivity= */ false
   )
 
-  @get:Rule
-  val oppiaTestRule = OppiaTestRule()
+  @Inject lateinit var context: Context
+  @Inject lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
+
+  private val internalProfileId = 0
 
   @Before
   fun setUp() {
     setUpTestApplicationComponent()
+    testCoroutineDispatchers.registerIdlingResource()
+  }
+
+  @After
+  fun tearDown() {
+    testCoroutineDispatchers.unregisterIdlingResource()
   }
 
   private fun setUpTestApplicationComponent() {
@@ -168,13 +181,65 @@ class MarkChaptersCompletedActivityTest {
     }
   }
 
-  // TODO: Add tests
-  // - testActivity_showConfirmationTrueInIntent_selectChapters_markCompleted_confirmationShown
-  // - testActivity_showConfirmationFalseInIntent_selectChapters_markCompleted_confirmationNotShown
+  @Test
+  fun testActivity_showConfirmationTrueInIntent_selectChapters_markCompleted_confirmationShown() {
+    launch<MarkChaptersCompletedActivity>(
+      createMarkChaptersCompletedActivityIntent(internalProfileId, showConfirmationNotice = true)
+    ).use {
+      testCoroutineDispatchers.runCurrent()
+      clickOnRecyclerViewItemAtPosition(itemPosition = 1)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 2)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 3)
+
+      onView(withId(R.id.mark_chapters_completed_mark_completed_text_view)).perform(click())
+
+      onView(withText(containsString("The following chapters will be marked as finished")))
+        .inRoot(isDialog())
+        .check(matches(isDisplayed()))
+    }
+  }
+
+  @Test
+  fun testActivity_showConfirmationFalseInIntent_selectChapters_markCompleted_confNotShown() {
+    launch<MarkChaptersCompletedActivity>(
+      createMarkChaptersCompletedActivityIntent(internalProfileId, showConfirmationNotice = false)
+    ).use {
+      testCoroutineDispatchers.runCurrent()
+      clickOnRecyclerViewItemAtPosition(itemPosition = 1)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 2)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 3)
+
+      onView(withId(R.id.mark_chapters_completed_mark_completed_text_view)).perform(click())
 
-  private fun createMarkChaptersCompletedActivityIntent(internalProfileId: Int): Intent {
+      // The notice dialog should not be showing.
+      onView(withText(containsString("The following chapters will be marked as finished")))
+        .check(doesNotExist())
+    }
+  }
+
+  private fun createMarkChaptersCompletedActivityIntent(
+    internalProfileId: Int,
+    showConfirmationNotice: Boolean = false
+  ): Intent {
     return MarkChaptersCompletedActivity.createMarkChaptersCompletedIntent(
-      context, internalProfileId, showConfirmationNotice = false
+      context, internalProfileId, showConfirmationNotice
+    )
+  }
+
+  private fun clickOnRecyclerViewItemAtPosition(itemPosition: Int) {
+    scrollToPosition(position = itemPosition)
+    onView(
+      atPositionOnView(
+        recyclerViewId = R.id.mark_chapters_completed_recycler_view,
+        position = itemPosition,
+        targetViewId = R.id.mark_chapters_completed_chapter_check_box
+      )
+    ).perform(click())
+  }
+
+  private fun scrollToPosition(position: Int) {
+    onView(withId(R.id.mark_chapters_completed_recycler_view)).perform(
+      scrollToPosition<ViewHolder>(position)
     )
   }
 
diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedFragmentTest.kt
index f23ff0abdad..6affd3cf620 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedFragmentTest.kt
@@ -2,25 +2,28 @@ package org.oppia.android.app.devoptions
 
 import android.app.Application
 import android.content.Context
-import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
+import androidx.test.core.app.ActivityScenario
 import androidx.test.core.app.ActivityScenario.launch
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions.doesNotExist
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.contrib.RecyclerViewActions.scrollToPosition
+import androidx.test.espresso.matcher.RootMatchers.isDialog
 import androidx.test.espresso.matcher.ViewMatchers.isChecked
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.isEnabled
 import androidx.test.espresso.matcher.ViewMatchers.isNotChecked
 import androidx.test.espresso.matcher.ViewMatchers.isRoot
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.rule.ActivityTestRule
 import com.google.common.truth.Truth.assertThat
 import dagger.Component
+import org.hamcrest.CoreMatchers.containsString
 import org.hamcrest.Matchers.not
 import org.junit.After
 import org.junit.Before
@@ -38,6 +41,7 @@ import org.oppia.android.app.application.ApplicationModule
 import org.oppia.android.app.application.ApplicationStartupListenerModule
 import org.oppia.android.app.application.testing.TestingBuildFlavorModule
 import org.oppia.android.app.devoptions.markchapterscompleted.testing.MarkChaptersCompletedTestActivity
+import org.oppia.android.app.model.ChapterPlayState
 import org.oppia.android.app.model.ProfileId
 import org.oppia.android.app.player.state.itemviewmodel.SplitScreenInteractionModule
 import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView
@@ -74,9 +78,11 @@ import org.oppia.android.domain.platformparameter.PlatformParameterModule
 import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule
 import org.oppia.android.domain.question.QuestionModule
 import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule
+import org.oppia.android.domain.topic.StoryProgressController
 import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule
 import org.oppia.android.testing.OppiaTestRule
 import org.oppia.android.testing.TestLogReportingModule
+import org.oppia.android.testing.data.DataProviderTestMonitor
 import org.oppia.android.testing.junit.InitializeDefaultLocaleRule
 import org.oppia.android.testing.robolectric.RobolectricModule
 import org.oppia.android.testing.story.StoryProgressTestHelper
@@ -111,34 +117,19 @@ import javax.inject.Singleton
   qualifiers = "port-xxhdpi"
 )
 class MarkChaptersCompletedFragmentTest {
-  @get:Rule
-  val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
+  @get:Rule val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
+  @get:Rule val oppiaTestRule = OppiaTestRule()
+
+  @Inject lateinit var storyProgressTestHelper: StoryProgressTestHelper
+  @Inject lateinit var storyProgressController: StoryProgressController
+  @Inject lateinit var fakeOppiaClock: FakeOppiaClock
+  @Inject lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
+  @Inject lateinit var context: Context
+  @Inject lateinit var monitorFactory: DataProviderTestMonitor.Factory
 
   private val internalProfileId = 0
   private lateinit var profileId: ProfileId
 
-  @Inject
-  lateinit var storyProgressTestHelper: StoryProgressTestHelper
-
-  @Inject
-  lateinit var fakeOppiaClock: FakeOppiaClock
-
-  @Inject
-  lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
-
-  @Inject
-  lateinit var context: Context
-
-  @get:Rule
-  val activityTestRule = ActivityTestRule(
-    MarkChaptersCompletedTestActivity::class.java,
-    /* initialTouchMode= */ true,
-    /* launchActivity= */ false
-  )
-
-  @get:Rule
-  val oppiaTestRule = OppiaTestRule()
-
   @Before
   fun setUp() {
     profileId = ProfileId.newBuilder().setInternalId(internalProfileId).build()
@@ -158,9 +149,7 @@ class MarkChaptersCompletedFragmentTest {
 
   @Test
   fun testMarkChaptersCompletedFragment_storiesAreShown() {
-    launch<MarkChaptersCompletedTestActivity>(
-      createMarkChaptersCompletedTestActivityIntent(internalProfileId)
-    ).use {
+    launchMarkChaptersCompletedFragmentTestActivity(internalProfileId).use {
       testCoroutineDispatchers.runCurrent()
       verifyItemTextOnRecyclerViewItemAtPosition(
         itemPosition = 0,
@@ -192,9 +181,7 @@ class MarkChaptersCompletedFragmentTest {
 
   @Test
   fun testMarkChaptersCompletedFragment_configChange_storiesAreShown() {
-    launch<MarkChaptersCompletedTestActivity>(
-      createMarkChaptersCompletedTestActivityIntent(internalProfileId)
-    ).use {
+    launchMarkChaptersCompletedFragmentTestActivity(internalProfileId).use {
       testCoroutineDispatchers.runCurrent()
       onView(isRoot()).perform(orientationLandscape())
       verifyItemTextOnRecyclerViewItemAtPosition(
@@ -227,9 +214,7 @@ class MarkChaptersCompletedFragmentTest {
 
   @Test
   fun testMarkChaptersCompletedFragment_chaptersAreShown() {
-    launch<MarkChaptersCompletedTestActivity>(
-      createMarkChaptersCompletedTestActivityIntent(internalProfileId)
-    ).use {
+    launchMarkChaptersCompletedFragmentTestActivity(internalProfileId).use {
       testCoroutineDispatchers.runCurrent()
       verifyItemTextOnRecyclerViewItemAtPosition(
         itemPosition = 1,
@@ -286,9 +271,7 @@ class MarkChaptersCompletedFragmentTest {
 
   @Test
   fun testMarkChaptersCompletedFragment_configChange_chaptersAreShown() {
-    launch<MarkChaptersCompletedTestActivity>(
-      createMarkChaptersCompletedTestActivityIntent(internalProfileId)
-    ).use {
+    launchMarkChaptersCompletedFragmentTestActivity(internalProfileId).use {
       testCoroutineDispatchers.runCurrent()
       onView(isRoot()).perform(orientationLandscape())
       verifyItemTextOnRecyclerViewItemAtPosition(
@@ -346,9 +329,7 @@ class MarkChaptersCompletedFragmentTest {
 
   @Test
   fun testMarkChaptersCompletedFragment_selectAll_isChecked() {
-    launch<MarkChaptersCompletedTestActivity>(
-      createMarkChaptersCompletedTestActivityIntent(internalProfileId)
-    ).use {
+    launchMarkChaptersCompletedFragmentTestActivity(internalProfileId).use {
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.mark_chapters_completed_all_check_box_container)).perform(click())
       onView(withId(R.id.mark_chapters_completed_all_check_box)).check(matches(isChecked()))
@@ -357,9 +338,7 @@ class MarkChaptersCompletedFragmentTest {
 
   @Test
   fun testMarkChaptersCompletedFragment_selectAll_configChange_isChecked() {
-    launch<MarkChaptersCompletedTestActivity>(
-      createMarkChaptersCompletedTestActivityIntent(internalProfileId)
-    ).use {
+    launchMarkChaptersCompletedFragmentTestActivity(internalProfileId).use {
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.mark_chapters_completed_all_check_box_container)).perform(click())
       onView(isRoot()).perform(orientationLandscape())
@@ -369,9 +348,7 @@ class MarkChaptersCompletedFragmentTest {
 
   @Test
   fun testMarkChaptersCompletedFragment_selectAll_selectsAllChapters() {
-    launch<MarkChaptersCompletedTestActivity>(
-      createMarkChaptersCompletedTestActivityIntent(internalProfileId)
-    ).use {
+    launchMarkChaptersCompletedFragmentTestActivity(internalProfileId).use {
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.mark_chapters_completed_all_check_box_container)).perform(click())
       verifyItemCheckedOnRecyclerViewItemAtPosition(itemPosition = 1)
@@ -389,9 +366,7 @@ class MarkChaptersCompletedFragmentTest {
 
   @Test
   fun testMarkChaptersCompletedFragment_deselectAllChapters_deselectsAllChapters() {
-    launch<MarkChaptersCompletedTestActivity>(
-      createMarkChaptersCompletedTestActivityIntent(internalProfileId)
-    ).use {
+    launchMarkChaptersCompletedFragmentTestActivity(internalProfileId).use {
       testCoroutineDispatchers.runCurrent()
       // Click one to select all chapters.
       onView(withId(R.id.mark_chapters_completed_all_check_box_container)).perform(click())
@@ -414,9 +389,7 @@ class MarkChaptersCompletedFragmentTest {
 
   @Test
   fun testMarkChaptersCompletedFragment_selectAll_configChange_selectsAllChapters() {
-    launch<MarkChaptersCompletedTestActivity>(
-      createMarkChaptersCompletedTestActivityIntent(internalProfileId)
-    ).use {
+    launchMarkChaptersCompletedFragmentTestActivity(internalProfileId).use {
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.mark_chapters_completed_all_check_box_container)).perform(click())
       onView(isRoot()).perform(orientationLandscape())
@@ -435,25 +408,21 @@ class MarkChaptersCompletedFragmentTest {
 
   @Test
   fun testMarkChaptersCompletedFragment_selectChaptersOfFirstStoryInOrder_chaptersAreChecked() {
-    launch<MarkChaptersCompletedTestActivity>(
-      createMarkChaptersCompletedTestActivityIntent(internalProfileId)
-    ).use {
+    launchMarkChaptersCompletedFragmentTestActivity(internalProfileId).use {
       testCoroutineDispatchers.runCurrent()
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 1)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 1)
       verifyItemCheckedOnRecyclerViewItemAtPosition(itemPosition = 1)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 2)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 2)
       verifyItemCheckedOnRecyclerViewItemAtPosition(itemPosition = 2)
     }
   }
 
   @Test
   fun testMarkChaptersCompletedFragment_selectChaptersOfFirstStoryInOrder_configChange_chaptersAreChecked() { // ktlint-disable max-line-length
-    launch<MarkChaptersCompletedTestActivity>(
-      createMarkChaptersCompletedTestActivityIntent(internalProfileId)
-    ).use {
+    launchMarkChaptersCompletedFragmentTestActivity(internalProfileId).use {
       testCoroutineDispatchers.runCurrent()
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 1)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 2)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 1)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 2)
       onView(isRoot()).perform(orientationLandscape())
       verifyItemCheckedOnRecyclerViewItemAtPosition(itemPosition = 1)
       verifyItemCheckedOnRecyclerViewItemAtPosition(itemPosition = 2)
@@ -462,9 +431,7 @@ class MarkChaptersCompletedFragmentTest {
 
   @Test
   fun testMarkChaptersCompletedFragment_firstStory_firstChapterUnchecked_secondChapterIsDisabled() {
-    launch<MarkChaptersCompletedTestActivity>(
-      createMarkChaptersCompletedTestActivityIntent(internalProfileId)
-    ).use {
+    launchMarkChaptersCompletedFragmentTestActivity(internalProfileId).use {
       testCoroutineDispatchers.runCurrent()
       scrollToPosition(position = 1)
       onView(
@@ -487,9 +454,7 @@ class MarkChaptersCompletedFragmentTest {
 
   @Test
   fun testMarkChaptersCompletedFragment_land_firstStory_firstChapterUnchecked_secondChapterIsDisabled() { // ktlint-disable max-line-length
-    launch<MarkChaptersCompletedTestActivity>(
-      createMarkChaptersCompletedTestActivityIntent(internalProfileId)
-    ).use {
+    launchMarkChaptersCompletedFragmentTestActivity(internalProfileId).use {
       testCoroutineDispatchers.runCurrent()
       onView(isRoot()).perform(orientationLandscape())
       scrollToPosition(position = 1)
@@ -513,13 +478,11 @@ class MarkChaptersCompletedFragmentTest {
 
   @Test
   fun testMarkChaptersCompletedFragment_firstStory_selectChaptersInOrder_unselectFirstChapter_secondChapterIsDisabled() { // ktlint-disable max-line-length
-    launch<MarkChaptersCompletedTestActivity>(
-      createMarkChaptersCompletedTestActivityIntent(internalProfileId)
-    ).use {
+    launchMarkChaptersCompletedFragmentTestActivity(internalProfileId).use {
       testCoroutineDispatchers.runCurrent()
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 1)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 2)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 1)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 1)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 2)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 1)
       onView(
         atPositionOnView(
           recyclerViewId = R.id.mark_chapters_completed_recycler_view,
@@ -532,13 +495,11 @@ class MarkChaptersCompletedFragmentTest {
 
   @Test
   fun testMarkChaptersCompletedFragment_firstStory_selectChaptersInOrder_unselectFirstChapter_configChange_secondChapterIsDisabled() { // ktlint-disable max-line-length
-    launch<MarkChaptersCompletedTestActivity>(
-      createMarkChaptersCompletedTestActivityIntent(internalProfileId)
-    ).use {
+    launchMarkChaptersCompletedFragmentTestActivity(internalProfileId).use {
       testCoroutineDispatchers.runCurrent()
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 1)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 2)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 1)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 1)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 2)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 1)
       onView(isRoot()).perform(orientationLandscape())
       onView(
         atPositionOnView(
@@ -552,40 +513,36 @@ class MarkChaptersCompletedFragmentTest {
 
   @Test
   fun testMarkChaptersCompletedFragment_selectAllChapters_allCheckBoxIsChecked() {
-    launch<MarkChaptersCompletedTestActivity>(
-      createMarkChaptersCompletedTestActivityIntent(internalProfileId)
-    ).use {
+    launchMarkChaptersCompletedFragmentTestActivity(internalProfileId).use {
       testCoroutineDispatchers.runCurrent()
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 1)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 2)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 3)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 5)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 7)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 8)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 10)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 11)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 13)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 14)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 1)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 2)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 3)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 5)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 7)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 8)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 10)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 11)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 13)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 14)
       onView(withId(R.id.mark_chapters_completed_all_check_box)).check(matches(isChecked()))
     }
   }
 
   @Test
   fun testMarkChaptersCompletedFragment_selectAllChapters_configChange_allCheckBoxIsChecked() {
-    launch<MarkChaptersCompletedTestActivity>(
-      createMarkChaptersCompletedTestActivityIntent(internalProfileId)
-    ).use {
+    launchMarkChaptersCompletedFragmentTestActivity(internalProfileId).use {
       testCoroutineDispatchers.runCurrent()
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 1)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 2)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 3)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 5)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 7)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 8)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 10)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 11)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 13)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 14)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 1)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 2)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 3)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 5)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 7)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 8)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 10)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 11)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 13)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 14)
       onView(isRoot()).perform(orientationLandscape())
       onView(withId(R.id.mark_chapters_completed_all_check_box)).check(matches(isChecked()))
     }
@@ -593,42 +550,38 @@ class MarkChaptersCompletedFragmentTest {
 
   @Test
   fun testMarkChaptersCompletedFragment_selectAllChapters_unselectOneChapter_allCheckBoxIsNotChecked() { // ktlint-disable max-line-length
-    launch<MarkChaptersCompletedTestActivity>(
-      createMarkChaptersCompletedTestActivityIntent(internalProfileId)
-    ).use {
+    launchMarkChaptersCompletedFragmentTestActivity(internalProfileId).use {
       testCoroutineDispatchers.runCurrent()
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 1)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 2)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 3)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 5)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 7)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 8)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 10)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 11)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 13)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 14)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 2)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 1)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 2)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 3)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 5)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 7)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 8)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 10)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 11)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 13)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 14)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 2)
       onView(withId(R.id.mark_chapters_completed_all_check_box)).check(matches(not(isChecked())))
     }
   }
 
   @Test
   fun testMarkChaptersCompletedFragment_selectAllChapters_unselectOneChapter_configChange_allCheckBoxIsNotChecked() { // ktlint-disable max-line-length
-    launch<MarkChaptersCompletedTestActivity>(
-      createMarkChaptersCompletedTestActivityIntent(internalProfileId)
-    ).use {
+    launchMarkChaptersCompletedFragmentTestActivity(internalProfileId).use {
       testCoroutineDispatchers.runCurrent()
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 1)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 2)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 3)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 5)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 7)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 8)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 10)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 11)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 13)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 14)
-      performItemCheckOnRecyclerViewItemAtPosition(itemPosition = 2)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 1)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 2)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 3)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 5)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 7)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 8)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 10)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 11)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 13)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 14)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 2)
       onView(isRoot()).perform(orientationLandscape())
       onView(withId(R.id.mark_chapters_completed_all_check_box)).check(matches(not(isChecked())))
     }
@@ -637,9 +590,7 @@ class MarkChaptersCompletedFragmentTest {
   @Test
   fun testMarkChaptersCompletedFragment_fractionsFirstChapterIsCompleted_isCheckedAndDisabled() {
     markFractionsFirstChapterCompleted()
-    launch<MarkChaptersCompletedTestActivity>(
-      createMarkChaptersCompletedTestActivityIntent(internalProfileId)
-    ).use {
+    launchMarkChaptersCompletedFragmentTestActivity(internalProfileId).use {
       testCoroutineDispatchers.runCurrent()
       scrollToPosition(position = 7)
       onView(
@@ -655,9 +606,7 @@ class MarkChaptersCompletedFragmentTest {
   @Test
   fun testMarkChaptersCompletedFragment_fractionsFirstChapterIsCompleted_configChange_isCheckedAndDisabled() { // ktlint-disable max-line-length
     markFractionsFirstChapterCompleted()
-    launch<MarkChaptersCompletedTestActivity>(
-      createMarkChaptersCompletedTestActivityIntent(internalProfileId)
-    ).use {
+    launchMarkChaptersCompletedFragmentTestActivity(internalProfileId).use {
       testCoroutineDispatchers.runCurrent()
       onView(isRoot()).perform(orientationLandscape())
       scrollToPosition(position = 7)
@@ -674,9 +623,7 @@ class MarkChaptersCompletedFragmentTest {
   @Test
   fun testMarkChaptersCompletedFragment_fractionsFirstChapterIsCompleted_nextChapterIsEnabled() {
     markFractionsFirstChapterCompleted()
-    launch<MarkChaptersCompletedTestActivity>(
-      createMarkChaptersCompletedTestActivityIntent(internalProfileId)
-    ).use {
+    launchMarkChaptersCompletedFragmentTestActivity(internalProfileId).use {
       testCoroutineDispatchers.runCurrent()
       scrollToPosition(position = 8)
       onView(
@@ -692,9 +639,7 @@ class MarkChaptersCompletedFragmentTest {
   @Test
   fun testMarkChaptersCompletedFragment_fractionsFirstChapterIsCompleted_configChange_nextChapterIsEnabled() { // ktlint-disable max-line-length
     markFractionsFirstChapterCompleted()
-    launch<MarkChaptersCompletedTestActivity>(
-      createMarkChaptersCompletedTestActivityIntent(internalProfileId)
-    ).use {
+    launchMarkChaptersCompletedFragmentTestActivity(internalProfileId).use {
       testCoroutineDispatchers.runCurrent()
       onView(isRoot()).perform(orientationLandscape())
       scrollToPosition(position = 8)
@@ -710,31 +655,35 @@ class MarkChaptersCompletedFragmentTest {
 
   @Test
   fun testMarkChaptersCompletedFragment_clickMarkCompleted_activityFinishes() {
-    activityTestRule.launchActivity(
-      createMarkChaptersCompletedTestActivityIntent(internalProfileId)
-    )
-    testCoroutineDispatchers.runCurrent()
-    onView(withId(R.id.mark_chapters_completed_mark_completed_text_view)).perform(click())
-    assertThat(activityTestRule.activity.isFinishing).isTrue()
+    launchMarkChaptersCompletedFragmentTestActivity(internalProfileId).use { scenario ->
+      testCoroutineDispatchers.runCurrent()
+
+      onView(withId(R.id.mark_chapters_completed_mark_completed_text_view)).perform(click())
+
+      scenario.onActivity { activity ->
+        assertThat(activity.isFinishing).isTrue()
+      }
+    }
   }
 
   @Test
   fun testMarkChaptersCompletedFragment_land_clickMarkCompleted_activityFinishes() {
-    activityTestRule.launchActivity(
-      createMarkChaptersCompletedTestActivityIntent(internalProfileId)
-    )
-    testCoroutineDispatchers.runCurrent()
-    onView(isRoot()).perform(orientationLandscape())
-    onView(withId(R.id.mark_chapters_completed_mark_completed_text_view)).perform(click())
-    assertThat(activityTestRule.activity.isFinishing).isTrue()
+    launchMarkChaptersCompletedFragmentTestActivity(internalProfileId).use { scenario ->
+      testCoroutineDispatchers.runCurrent()
+      onView(isRoot()).perform(orientationLandscape())
+
+      onView(withId(R.id.mark_chapters_completed_mark_completed_text_view)).perform(click())
+
+      scenario.onActivity { activity ->
+        assertThat(activity.isFinishing).isTrue()
+      }
+    }
   }
 
   @Test
   fun testMarkChaptersCompletedFragment_allLessonsAreCompleted_allCheckboxIsChecked() {
     markAllLessonsCompleted()
-    launch<MarkChaptersCompletedTestActivity>(
-      createMarkChaptersCompletedTestActivityIntent(internalProfileId)
-    ).use {
+    launchMarkChaptersCompletedFragmentTestActivity(internalProfileId).use {
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.mark_chapters_completed_all_check_box)).check(matches(isChecked()))
     }
@@ -743,29 +692,222 @@ class MarkChaptersCompletedFragmentTest {
   @Test
   fun testMarkChaptersCompletedFragment_allLessonsAreCompleted_configChange_allCheckboxIsChecked() {
     markAllLessonsCompleted()
-    launch<MarkChaptersCompletedTestActivity>(
-      createMarkChaptersCompletedTestActivityIntent(internalProfileId)
-    ).use {
+    launchMarkChaptersCompletedFragmentTestActivity(internalProfileId).use {
       testCoroutineDispatchers.runCurrent()
       onView(isRoot()).perform(orientationLandscape())
       onView(withId(R.id.mark_chapters_completed_all_check_box)).check(matches(isChecked()))
     }
   }
 
-  // TODO: Add tests
-  // - testFragment_showConfirmationTrueInArgs_selectChapters_markCompleted_confirmationShown
-  // - testFragment_showConfirmationFalseInArgs_selectChapters_markCompleted_confirmationNotShown
-  // - testFragment_withNotice_selectNoChapters_markCompleted_activityClosedWithoutConfirmation
-  // - testFragment_withNotice_selectOneChapter_markCompleted_confirmationIncludesLessonTitle
-  // - testFragment_withNotice_selectTwoChapters_markCompleted_confirmationIncludesLessonTitles
-  // - testFragment_withNotice_selectThreeChapters_markCompleted_confirmationIncludesLessonTitles
-  // - testFragment_withNotice_selectChapters_markCompleted_cancelConfirmation_activityStillOpen
-  // - testFragment_withNotice_selectChapters_markCompleted_confirmSelection_activityClosed
-  // - testFragment_withNotice_selectChapters_markCompleted_confirmSelection_expsMarkedAsDone
+  @Test
+  fun testFragment_showConfirmationTrueInArgs_selectChapters_markCompleted_confirmationShown() {
+    launchMarkChaptersCompletedFragmentTestActivity(
+      internalProfileId, showConfirmationNotice = true
+    ).use { scenario ->
+      testCoroutineDispatchers.runCurrent()
+      clickOnRecyclerViewItemAtPosition(itemPosition = 1)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 2)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 3)
+
+      onView(withId(R.id.mark_chapters_completed_mark_completed_text_view)).perform(click())
+
+      // The confirmation notice should show & the activity should not be ending.
+      onView(withText(containsString("The following chapters will be marked as finished")))
+        .inRoot(isDialog())
+        .check(matches(isDisplayed()))
+      scenario.onActivity { activity ->
+        assertThat(activity.isFinishing).isFalse()
+      }
+    }
+  }
+
+  @Test
+  fun testFragment_showConfirmationFalseInArgs_selectChapters_markCompleted_confirmationNotShown() {
+    launchMarkChaptersCompletedFragmentTestActivity(
+      internalProfileId, showConfirmationNotice = false
+    ).use {
+      testCoroutineDispatchers.runCurrent()
+      clickOnRecyclerViewItemAtPosition(itemPosition = 1)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 2)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 3)
+
+      onView(withId(R.id.mark_chapters_completed_mark_completed_text_view)).perform(click())
+
+      // The notice dialog should not be showing.
+      onView(withText(containsString("The following chapters will be marked as finished")))
+        .check(doesNotExist())
+    }
+  }
+
+  @Test
+  fun testFragment_withNotice_selectNoChapters_markCompleted_activityClosedWithoutConfirmation() {
+    launchMarkChaptersCompletedFragmentTestActivity(
+      internalProfileId, showConfirmationNotice = true
+    ).use { scenario ->
+      testCoroutineDispatchers.runCurrent()
+
+      onView(withId(R.id.mark_chapters_completed_mark_completed_text_view)).perform(click())
+
+      // The notice dialog should not be showing & the activity should be ending since there are no
+      // lessons being changed.
+      onView(withText(containsString("The following chapters will be marked as finished")))
+        .check(doesNotExist())
+      scenario.onActivity { activity ->
+        assertThat(activity.isFinishing).isTrue()
+      }
+    }
+  }
+
+  @Test
+  fun testFragment_withNotice_selectOneChapter_markCompleted_confirmationIncludesLessonTitle() {
+    launchMarkChaptersCompletedFragmentTestActivity(
+      internalProfileId, showConfirmationNotice = true
+    ).use {
+      testCoroutineDispatchers.runCurrent()
+
+      clickOnRecyclerViewItemAtPosition(itemPosition = 1)
+      onView(withId(R.id.mark_chapters_completed_mark_completed_text_view)).perform(click())
+
+      onView(
+        withText(
+          "The following chapters will be marked as finished: Prototype Exploration. Note that" +
+            " this is irreversible and will erase any partial lesson progress."
+        )
+      ).inRoot(isDialog()).check(matches(isDisplayed()))
+    }
+  }
+
+  @Test
+  fun testFragment_withNotice_selectTwoChapters_markCompleted_confirmationIncludesLessonTitles() {
+    launchMarkChaptersCompletedFragmentTestActivity(
+      internalProfileId, showConfirmationNotice = true
+    ).use {
+      testCoroutineDispatchers.runCurrent()
+
+      clickOnRecyclerViewItemAtPosition(itemPosition = 1)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 2)
+      onView(withId(R.id.mark_chapters_completed_mark_completed_text_view)).perform(click())
+
+      onView(
+        withText(
+          "The following chapters will be marked as finished: Prototype Exploration and Image" +
+            " Region Selection Exploration. Note that this is irreversible and will erase any" +
+            " partial lesson progress."
+        )
+      ).inRoot(isDialog()).check(matches(isDisplayed()))
+    }
+  }
+
+  @Test
+  fun testFragment_withNotice_selectThreeChapters_markCompleted_confirmationIncludesLessonTitles() {
+    launchMarkChaptersCompletedFragmentTestActivity(
+      internalProfileId, showConfirmationNotice = true
+    ).use {
+      testCoroutineDispatchers.runCurrent()
+
+      clickOnRecyclerViewItemAtPosition(itemPosition = 1)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 2)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 3)
+      onView(withId(R.id.mark_chapters_completed_mark_completed_text_view)).perform(click())
+
+      onView(
+        withText(
+          "The following chapters will be marked as finished: Prototype Exploration, Image" +
+            " Region Selection Exploration, and Math Expressions. Note that this is" +
+            " irreversible and will erase any partial lesson progress."
+        )
+      ).inRoot(isDialog()).check(matches(isDisplayed()))
+    }
+  }
+
+  @Test
+  fun testFragment_withNotice_selectChapters_markCompleted_cancelConfirmation_activityStillOpen() {
+    launchMarkChaptersCompletedFragmentTestActivity(
+      internalProfileId, showConfirmationNotice = true
+    ).use { scenario ->
+      testCoroutineDispatchers.runCurrent()
+      clickOnRecyclerViewItemAtPosition(itemPosition = 1)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 2)
+      onView(withId(R.id.mark_chapters_completed_mark_completed_text_view)).perform(click())
 
-  private fun createMarkChaptersCompletedTestActivityIntent(internalProfileId: Int): Intent {
-    return MarkChaptersCompletedTestActivity.createMarkChaptersCompletedTestIntent(
-      context, internalProfileId
+      onView(withText("Cancel")).inRoot(isDialog()).perform(click())
+
+      // The activity should still be open, and the dialog no longer showing.
+      onView(withText(containsString("The following chapters will be marked as finished")))
+        .check(doesNotExist())
+      scenario.onActivity { activity ->
+        assertThat(activity.isFinishing).isFalse()
+      }
+    }
+  }
+
+  @Test
+  fun testFragment_withNotice_selectChapters_markCompleted_cancelConfirmation_expsNotCompleted() {
+    launchMarkChaptersCompletedFragmentTestActivity(
+      internalProfileId, showConfirmationNotice = true
+    ).use {
+      testCoroutineDispatchers.runCurrent()
+      clickOnRecyclerViewItemAtPosition(itemPosition = 1)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 2)
+      onView(withId(R.id.mark_chapters_completed_mark_completed_text_view)).perform(click())
+
+      onView(withText("Cancel")).inRoot(isDialog()).perform(click())
+
+      // The explorations should still be not completed since the confirmation was canceled.
+      val exp1PlayState = retrievePlayStateInFirstTestStory(expId = "test_exp_id_2")
+      val exp2PlayState = retrievePlayStateInFirstTestStory(expId = "13")
+      assertThat(exp1PlayState).isEqualTo(ChapterPlayState.NOT_STARTED)
+      assertThat(exp2PlayState).isEqualTo(ChapterPlayState.NOT_STARTED)
+    }
+  }
+
+  @Test
+  fun testFragment_withNotice_selectChapters_markCompleted_confirmSelection_activityClosed() {
+    launchMarkChaptersCompletedFragmentTestActivity(
+      internalProfileId, showConfirmationNotice = true
+    ).use { scenario ->
+      testCoroutineDispatchers.runCurrent()
+      clickOnRecyclerViewItemAtPosition(itemPosition = 1)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 2)
+      onView(withId(R.id.mark_chapters_completed_mark_completed_text_view)).perform(click())
+
+      onView(withText("Confirm completions")).inRoot(isDialog()).perform(click())
+
+      // The activity should be ending since the completions were confirmed.
+      scenario.onActivity { activity ->
+        assertThat(activity.isFinishing).isTrue()
+      }
+    }
+  }
+
+  @Test
+  fun testFragment_withNotice_selectChapters_markCompleted_confirmSelection_expsMarkedAsDone() {
+    launchMarkChaptersCompletedFragmentTestActivity(
+      internalProfileId, showConfirmationNotice = true
+    ).use {
+      testCoroutineDispatchers.runCurrent()
+      clickOnRecyclerViewItemAtPosition(itemPosition = 1)
+      clickOnRecyclerViewItemAtPosition(itemPosition = 2)
+      onView(withId(R.id.mark_chapters_completed_mark_completed_text_view)).perform(click())
+
+      onView(withText("Confirm completions")).inRoot(isDialog()).perform(click())
+
+      // The lessons should now be marked as completed since the completions were confirmed.
+      val exp1PlayState = retrievePlayStateInFirstTestStory(expId = "test_exp_id_2")
+      val exp2PlayState = retrievePlayStateInFirstTestStory(expId = "13")
+      assertThat(exp1PlayState).isEqualTo(ChapterPlayState.COMPLETED)
+      assertThat(exp2PlayState).isEqualTo(ChapterPlayState.COMPLETED)
+    }
+  }
+
+  private fun launchMarkChaptersCompletedFragmentTestActivity(
+    internalProfileId: Int,
+    showConfirmationNotice: Boolean = false
+  ): ActivityScenario<MarkChaptersCompletedTestActivity> {
+    return launch(
+      MarkChaptersCompletedTestActivity.createMarkChaptersCompletedTestIntent(
+        context, internalProfileId, showConfirmationNotice
+      )
     )
   }
 
@@ -784,7 +926,7 @@ class MarkChaptersCompletedFragmentTest {
     ).check(matches(withText(stringToMatch)))
   }
 
-  private fun performItemCheckOnRecyclerViewItemAtPosition(itemPosition: Int) {
+  private fun clickOnRecyclerViewItemAtPosition(itemPosition: Int) {
     scrollToPosition(position = itemPosition)
     onView(
       atPositionOnView(
@@ -837,6 +979,21 @@ class MarkChaptersCompletedFragmentTest {
     )
   }
 
+  private fun retrieveChapterPlayState(
+    topicId: String,
+    storyId: String,
+    expId: String
+  ): ChapterPlayState {
+    val playStateProvider =
+      storyProgressController.retrieveChapterPlayStateByExplorationId(
+        profileId, topicId, storyId, expId
+      )
+    return monitorFactory.waitForNextSuccessfulResult(playStateProvider)
+  }
+
+  private fun retrievePlayStateInFirstTestStory(expId: String) =
+    retrieveChapterPlayState(topicId = "test_topic_id_0", storyId = "test_story_id_0", expId)
+
   // TODO(#59): Figure out a way to reuse modules instead of needing to re-declare them.
   @Singleton
   @Component(
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 b30e7cc574a..0f7816e357c 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
@@ -27,6 +27,7 @@ import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.contrib.RecyclerViewActions.scrollToHolder
 import androidx.test.espresso.intent.Intents
 import androidx.test.espresso.matcher.RootMatchers.isDialog
+import androidx.test.espresso.matcher.ViewMatchers.Visibility.GONE
 import androidx.test.espresso.matcher.ViewMatchers.hasChildCount
 import androidx.test.espresso.matcher.ViewMatchers.isClickable
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
@@ -34,6 +35,7 @@ import androidx.test.espresso.matcher.ViewMatchers.isEnabled
 import androidx.test.espresso.matcher.ViewMatchers.isFocusable
 import androidx.test.espresso.matcher.ViewMatchers.isRoot
 import androidx.test.espresso.matcher.ViewMatchers.withContentDescription
+import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility
 import androidx.test.espresso.matcher.ViewMatchers.withHint
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
@@ -57,7 +59,6 @@ import org.hamcrest.Description
 import org.hamcrest.Matcher
 import org.hamcrest.TypeSafeMatcher
 import org.junit.After
-import org.junit.Before
 import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
@@ -132,7 +133,6 @@ import org.oppia.android.domain.oppialogger.analytics.ApplicationLifecycleModule
 import org.oppia.android.domain.oppialogger.analytics.CpuPerformanceSnapshotterModule
 import org.oppia.android.domain.oppialogger.logscheduler.MetricLogSchedulerModule
 import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule
-import org.oppia.android.domain.platformparameter.PlatformParameterModule
 import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule
 import org.oppia.android.domain.question.QuestionModule
 import org.oppia.android.domain.topic.FRACTIONS_EXPLORATION_ID_1
@@ -233,37 +233,6 @@ class StateFragmentTest {
 
   private val profileId = ProfileId.newBuilder().apply { internalId = 1 }.build()
 
-  @Before
-  fun setUp() {
-    TestPlatformParameterModule.forceEnableContinueButtonAnimation(false)
-    Intents.init()
-    setUpTestApplicationComponent()
-    testCoroutineDispatchers.registerIdlingResource()
-    profileTestHelper.initializeProfiles()
-
-    // Initialize Glide such that all of its executors use the same shared dispatcher pool as the
-    // rest of Oppia so that thread execution can be synchronized via Oppia's test coroutine
-    // dispatchers.
-    val executorService = MockGlideExecutor.newTestExecutor(
-      CoroutineExecutorService(backgroundCoroutineDispatcher)
-    )
-    Glide.init(
-      context,
-      GlideBuilder().setDiskCacheExecutor(executorService)
-        .setAnimationExecutor(executorService)
-        .setSourceExecutor(executorService)
-    )
-
-    // Only initialize the Robolectric shadows when running on Robolectric (and use reflection since
-    // Espresso can't load Robolectric into its classpath).
-    if (isOnRobolectric()) {
-      val dataSource = createAudioDataSource(
-        explorationId = FRACTIONS_EXPLORATION_ID_1, audioFileName = "content-en-ouqm7j21vt8.mp3"
-      )
-      addShadowMediaPlayerException(dataSource, IOException("Test does not have networking"))
-    }
-  }
-
   @After
   fun tearDown() {
     testCoroutineDispatchers.unregisterIdlingResource()
@@ -297,6 +266,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_loadExp_explorationLoads() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
 
@@ -307,6 +277,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_loadExp_explorationLoads_changeConfiguration_buttonIsNotVisible() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
 
@@ -319,6 +290,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_loadExp_explorationHasContinueButton() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
 
@@ -330,6 +302,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_loadExp_changeConfiguration_explorationHasContinueButton() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
 
@@ -342,6 +315,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_loadExp_secondState_hasSubmitButton() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
 
@@ -356,6 +330,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_loadExp_changeConfiguration_secondState_hasSubmitButton() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       rotateToLandscape()
@@ -371,6 +346,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_loadExp_secondState_submitAnswer_submitButtonIsEnabled() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       clickContinueInteractionButton()
@@ -384,6 +360,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_loadExp_secondState_submitAnswer_clickSubmit_continueButtonIsVisible() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       clickContinueInteractionButton()
@@ -400,6 +377,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_loadExp_landscape_secondState_submitAnswer_submitButtonIsEnabled() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       rotateToLandscape()
@@ -414,6 +392,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_loadExp_land_secondState_submitAnswer_clickSubmit_continueIsVisible() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       rotateToLandscape()
@@ -431,6 +410,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_loadExp_secondState_submitInvalidAnswer_disablesSubmitAndShowsError() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       clickContinueInteractionButton()
@@ -447,6 +427,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_loadExp_land_secondState_submitInvalidAnswer_disablesSubmitAndShowsError() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       rotateToLandscape()
@@ -464,6 +445,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_loadExp_secondState_invalidAnswer_submitAnswerIsNotEnabled() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       clickContinueInteractionButton()
@@ -477,6 +459,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_loadExp_secondState_invalidAnswer_updated_submitAnswerIsEnabled() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       clickContinueInteractionButton()
@@ -494,6 +477,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_loadExp_land_secondState_invalidAnswer_submitAnswerIsNotEnabled() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       rotateToLandscape()
@@ -508,6 +492,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_loadExp_land_secondState_invalidAnswer_updated_submitAnswerIsEnabled() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       rotateToLandscape()
@@ -526,6 +511,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_loadExp_secondState_submitWrongAnswer_contentDescriptionIsCorrect() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use { scenario ->
       startPlayingExploration()
       clickContinueInteractionButton()
@@ -547,6 +533,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_loadExp_secondState_submitCorrectAnswer_contentDescriptionIsCorrect() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       clickContinueInteractionButton()
@@ -568,6 +555,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_loadExp_thirdState_hasDisabledSubmitButton() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -583,6 +571,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_loadExp_changeConfiguration_thirdState_hasDisabledSubmitButton() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       rotateToLandscape()
@@ -600,6 +589,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_loadExp_thirdState_selectAnswer_submitButtonIsEnabled() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -614,6 +604,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_loadExp_thirdState_selectAnswer_clickSubmit_continueButtonIsVisible() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -631,6 +622,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_loadExp_landscape_thirdState_selectAnswer_submitButtonIsEnabled() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       rotateToLandscape()
@@ -646,6 +638,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_loadExp_land_thirdState_selectAnswer_clickSubmit_continueIsVisible() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       rotateToLandscape()
@@ -664,6 +657,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_loadExp_thirdState_submitInvalidAnswer_disablesSubmitButton() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -681,6 +675,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_loadExp_land_thirdState_submitInvalidAnswer_disablesSubmitButton() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -698,6 +693,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_loadExp_thirdState_invalidAnswer_updated_submitAnswerIsEnabled() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -716,6 +712,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_loadExp_firstState_previousAndNextButtonIsNotDisplayed() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
 
@@ -726,6 +723,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_loadDragDropExp_mergeFirstTwoItems_worksCorrectly() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_4, shouldSavePartialProgress = false).use {
       startPlayingExploration()
 
@@ -744,6 +742,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_loadDragDropExp_mergeFirstTwoItems_invalidAnswer_correctItemCount() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_4, shouldSavePartialProgress = false).use {
       startPlayingExploration()
 
@@ -764,6 +763,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_loadDragDropExp_wrongAnswer_contentDescriptionIsCorrect() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_4, shouldSavePartialProgress = false).use {
       startPlayingExploration()
 
@@ -784,6 +784,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ESPRESSO) // TODO(#1612): Enable for Robolectric.
   fun testStateFragment_loadDragDropExp_correctAnswer_contentDescriptionIsCorrect() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -816,6 +817,7 @@ class StateFragmentTest {
     // Note to self: current setup allows the user to drag the view without issues (now that
     // event interception isn't a problem), however the view is going partly offscreen which
     // is triggering an infinite animation loop in ItemTouchHelper).
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_4, shouldSavePartialProgress = false).use {
       startPlayingExploration()
 
@@ -835,6 +837,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_loadDragDropExp_mergeFirstTwoItems_unlinkFirstItem_worksCorrectly() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_4, shouldSavePartialProgress = false).use {
       startPlayingExploration()
 
@@ -856,6 +859,7 @@ class StateFragmentTest {
   @RunOn(TestPlatform.ESPRESSO) // TODO(#1611): Enable for Robolectric.
   @Ignore("Flaky test") // TODO(#3171): Fix ImageRegion failing test cases.
   fun testStateFragment_loadImageRegion_clickRegion6_submitButtonEnabled() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_13, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       waitForImageViewInteractionToFullyLoad()
@@ -871,6 +875,7 @@ class StateFragmentTest {
   @RunOn(TestPlatform.ESPRESSO) // TODO(#1611): Enable for Robolectric.
   @Ignore("Flaky test") // TODO(#3171): Fix ImageRegion failing test cases.
   fun testStateFragment_loadImageRegion_clickRegion6_clickSubmit_receivesCorrectFeedback() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_13, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       waitForImageViewInteractionToFullyLoad()
@@ -891,6 +896,7 @@ class StateFragmentTest {
   @RunOn(TestPlatform.ESPRESSO) // TODO(#1611): Enable for Robolectric.
   @Ignore("Flaky test") // TODO(#3171): Fix ImageRegion failing test cases.
   fun testStateFragment_loadImageRegion_submitButtonDisabled() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_13, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       waitForImageViewInteractionToFullyLoad()
@@ -905,6 +911,7 @@ class StateFragmentTest {
   @RunOn(TestPlatform.ESPRESSO) // TODO(#1611): Enable for Robolectric.
   @Ignore("Flaky test") // TODO(#3171): Fix ImageRegion failing test cases.
   fun testStateFragment_loadImageRegion_defaultRegionClick_defRegionClicked_submitButtonDisabled() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_13, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       waitForImageViewInteractionToFullyLoad()
@@ -919,6 +926,7 @@ class StateFragmentTest {
   @RunOn(TestPlatform.ESPRESSO) // TODO(#1611): Enable for Robolectric.
   @Ignore("Flaky test") // TODO(#3171): Fix ImageRegion failing test cases.
   fun testStateFragment_loadImageRegion_clickedRegion6_region6Clicked_submitButtonEnabled() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_13, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       waitForImageViewInteractionToFullyLoad()
@@ -934,6 +942,7 @@ class StateFragmentTest {
   @RunOn(TestPlatform.ESPRESSO) // TODO(#1611): Enable for Robolectric.
   @Ignore("Flaky test") // TODO(#3171): Fix ImageRegion failing test cases.
   fun testStateFragment_loadImageRegion_clickedRegion6_region6Clicked_correctFeedback() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_13, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       waitForImageViewInteractionToFullyLoad()
@@ -954,6 +963,7 @@ class StateFragmentTest {
   @RunOn(TestPlatform.ESPRESSO) // TODO(#1611): Enable for Robolectric.
   @Ignore("Flaky test") // TODO(#3171): Fix ImageRegion failing test cases.
   fun testStateFragment_loadImageRegion_clickedRegion6_region6Clicked_correctAnswer() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_13, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       waitForImageViewInteractionToFullyLoad()
@@ -974,6 +984,7 @@ class StateFragmentTest {
   @RunOn(TestPlatform.ESPRESSO) // TODO(#1611): Enable for Robolectric.
   @Ignore("Flaky test") // TODO(#3171): Fix ImageRegion failing test cases.
   fun testStateFragment_loadImageRegion_clickedRegion6_region6Clicked_continueButtonIsDisplayed() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_13, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       waitForImageViewInteractionToFullyLoad()
@@ -990,6 +1001,7 @@ class StateFragmentTest {
   @RunOn(TestPlatform.ESPRESSO) // TODO(#1611): Enable for Robolectric.
   @Ignore("Flaky test") // TODO(#3171): Fix ImageRegion failing test cases.
   fun testStateFragment_loadImageRegion_clickRegion6_clickedRegion5_clickRegion5_correctFeedback() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_13, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       waitForImageViewInteractionToFullyLoad()
@@ -1009,6 +1021,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_loadExp_changeConfiguration_firstState_prevAndNextButtonIsNotDisplayed() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
 
@@ -1021,6 +1034,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_loadExp_submitAnswer_clickContinueButton_previousButtonIsDisplayed() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
 
@@ -1032,6 +1046,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_loadExp_changeConfig_submitAnswer_clickContinue_prevButtonIsDisplayed() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       rotateToLandscape()
@@ -1044,6 +1059,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_loadExp_submitAnswer_clickContinueThenPrevious_onlyNextButtonIsShown() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       clickContinueInteractionButton()
@@ -1059,6 +1075,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_loadExp_changeConfig_submit_clickContinueThenPrev_onlyNextButtonShown() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       rotateToLandscape()
@@ -1075,6 +1092,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_loadExp_submitAnswer_clickContinueThenPrevThenNext_prevAndSubmitShown() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       clickContinueInteractionButton()
@@ -1093,6 +1111,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_loadExp_land_submit_clickContinueThenPrevThenNext_prevAndSubmitShown() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       rotateToLandscape()
@@ -1113,6 +1132,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ESPRESSO) // TODO(#1612): Enable for Robolectric.
   fun testStateFragment_loadExp_continueToEndExploration_hasReturnToTopicButton() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
 
@@ -1129,6 +1149,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ESPRESSO) // TODO(#1612): Enable for Robolectric.
   fun testStateFragment_loadExp_changeConfiguration_continueToEnd_hasReturnToTopicButton() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       rotateToLandscape()
@@ -1146,6 +1167,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ESPRESSO) // TODO(#1612): Enable for Robolectric.
   fun testStateFragment_loadExp_continueToEndExploration_clickReturnToTopic_destroysActivity() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playThroughPrototypeExploration()
@@ -1160,6 +1182,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ESPRESSO) // TODO(#1612): Enable for Robolectric.
   fun testStateFragment_loadExp_changeConfig_continueToEnd_clickReturnToTopic_destroysActivity() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       rotateToLandscape()
@@ -1174,6 +1197,7 @@ class StateFragmentTest {
 
   @Test
   fun testContentCard_forPrototypeExploration_withCustomOppiaTags_displaysParsedHtml() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
 
@@ -1185,6 +1209,7 @@ class StateFragmentTest {
 
   @Test
   fun testContentCard_forPrototypeExploration_changeConfig_withCustomTags_displaysParsedHtml() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
 
@@ -1196,6 +1221,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_inputRatio_correctAnswerSubmitted_correctAnswerIsDisplayed() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -1215,6 +1241,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_forHintsAndSolution_incorrectInputTwice_hintBulbContainerIsVisible() {
+    setUpTestWithStudyOff()
     launchForExploration(FRACTIONS_EXPLORATION_ID_1, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       selectMultipleChoiceOption(
@@ -1237,6 +1264,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_forMisconception_showsLinkTextForConceptCard() {
+    setUpTestWithStudyOff()
     launchForExploration(FRACTIONS_EXPLORATION_ID_1, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       selectMultipleChoiceOption(
@@ -1261,6 +1289,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_landscape_forMisconception_showsLinkTextForConceptCard() {
+    setUpTestWithStudyOff()
     launchForExploration(FRACTIONS_EXPLORATION_ID_1, shouldSavePartialProgress = false).use {
       rotateToLandscape()
       startPlayingExploration()
@@ -1286,6 +1315,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_forMisconception_clickLinkText_opensConceptCard() {
+    setUpTestWithStudyOff()
     launchForExploration(FRACTIONS_EXPLORATION_ID_1, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       selectMultipleChoiceOption(
@@ -1309,6 +1339,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_landscape_forMisconception_clickLinkText_opensConceptCard() {
+    setUpTestWithStudyOff()
     launchForExploration(FRACTIONS_EXPLORATION_ID_1, shouldSavePartialProgress = false).use {
       rotateToLandscape()
       startPlayingExploration()
@@ -1333,6 +1364,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_interactions_initialStateIsContinueInteraction() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
 
@@ -1344,6 +1376,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_interactions_continueInteraction_canSuccessfullySubmitAnswer() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
 
@@ -1358,6 +1391,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_interactions_fractionInteraction_canSuccessfullySubmitAnswer() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -1373,6 +1407,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_interactions_multipleChoiceInteraction_canSuccessfullySubmitAnswer() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -1389,6 +1424,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_interactions_radioItemSelection_hasCorrectAccessibilityAttributes() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -1405,6 +1441,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_interactions_radioItemSelection_canSuccessfullySubmitAnswer() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -1422,6 +1459,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_interactions_checkboxItemSelection_hasCorrectAccessibilityAttributes() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -1437,6 +1475,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_interactions_checkboxItemSelection_canSuccessfullySubmitAnswer() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -1455,6 +1494,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_interactions_numericInputInteraction_canSuccessfullySubmitAnswer() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -1474,6 +1514,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_interactions_numericInputInteraction_hasCorrectHint() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -1491,6 +1532,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_interactions_ratioInputInteraction_canSuccessfullySubmitAnswer() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -1511,6 +1553,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_interactions_textInputInteraction_canSuccessfullySubmitAnswer() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -1533,6 +1576,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ESPRESSO) // TODO(#1612): Enable for Robolectric.
   fun testStateFragment_interactions_dragAndDropNoGrouping_canSuccessfullySubmitAnswer() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -1556,6 +1600,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ESPRESSO) // TODO(#1612): Enable for Robolectric.
   fun testStateFragment_interactions_dragAndDropWithGrouping_canSuccessfullySubmitAnswer() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -1578,6 +1623,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_fractionInput_textViewHasTextInputType() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use { scenario ->
       startPlayingExploration()
 
@@ -1595,6 +1641,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_ratioInput_textViewHasTextInputType() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use { scenario ->
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -1618,6 +1665,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ESPRESSO) // TODO(#1612): Enable for Robolectric.
   fun testStateFragment_loadExp_saveProg_continueToEndExp_clickReturnToTopic_partialProgDeleted() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
       startPlayingExploration()
       playThroughPrototypeExploration()
@@ -1636,6 +1684,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ROBOLECTRIC) // TODO(#3858): Enable for Espresso.
   fun testStateFragment_englishContentLang_content_isInEnglish() {
+    setUpTestWithStudyOff()
     updateContentLanguage(profileId, OppiaLanguage.ENGLISH)
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
       startPlayingExploration()
@@ -1648,6 +1697,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ROBOLECTRIC, buildEnvironments = [BuildEnvironment.BAZEL])
   fun testStateFragment_arabicContentLang_content_isInArabic() {
+    setUpTestWithStudyOff()
     updateContentLanguage(profileId, OppiaLanguage.ARABIC)
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
       startPlayingExploration()
@@ -1660,6 +1710,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ROBOLECTRIC, buildEnvironments = [BuildEnvironment.BAZEL])
   fun testStateFragment_arabicContentLang_thenEnglish_content_isInEnglish() {
+    setUpTestWithStudyOff()
     updateContentLanguage(profileId, OppiaLanguage.ARABIC)
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
       startPlayingExploration()
@@ -1673,6 +1724,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ROBOLECTRIC) // TODO(#3858): Enable for Espresso.
   fun testStateFragment_english_continueInteraction_buttonIsInEnglish() {
+    setUpTestWithStudyOff()
     updateContentLanguage(profileId, OppiaLanguage.ENGLISH)
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
       startPlayingExploration()
@@ -1685,6 +1737,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ROBOLECTRIC, buildEnvironments = [BuildEnvironment.BAZEL])
   fun testStateFragment_arabic_continueInteraction_buttonIsInEnglish() {
+    setUpTestWithStudyOff()
     updateContentLanguage(profileId, OppiaLanguage.ARABIC)
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
       startPlayingExploration()
@@ -1697,6 +1750,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ROBOLECTRIC) // TODO(#3858): Enable for Espresso.
   fun testStateFragment_english_fractionInput_placeholderIsInEnglish() {
+    setUpTestWithStudyOff()
     updateContentLanguage(profileId, OppiaLanguage.ENGLISH)
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
       startPlayingExploration()
@@ -1711,6 +1765,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ROBOLECTRIC) // TODO(#3858): Enable for Espresso.
   fun testStateFragment_english_fractionInput_submitAnswer_answerMatchesSubmission() {
+    setUpTestWithStudyOff()
     updateContentLanguage(profileId, OppiaLanguage.ENGLISH)
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
       startPlayingExploration()
@@ -1728,6 +1783,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ROBOLECTRIC, buildEnvironments = [BuildEnvironment.BAZEL])
   fun testStateFragment_arabic_fractionInput_placeholderIsInArabic() {
+    setUpTestWithStudyOff()
     updateContentLanguage(profileId, OppiaLanguage.ARABIC)
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
       startPlayingExploration()
@@ -1742,6 +1798,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ROBOLECTRIC, buildEnvironments = [BuildEnvironment.BAZEL])
   fun testStateFragment_arabic_fractionInput_submitAnswer_answerMatchesSubmission() {
+    setUpTestWithStudyOff()
     updateContentLanguage(profileId, OppiaLanguage.ARABIC)
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
       startPlayingExploration()
@@ -1760,6 +1817,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ROBOLECTRIC) // TODO(#3858): Enable for Espresso.
   fun testStateFragment_englishContentLang_feedback_isInEnglish() {
+    setUpTestWithStudyOff()
     updateContentLanguage(profileId, OppiaLanguage.ENGLISH)
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
       startPlayingExploration()
@@ -1777,6 +1835,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ROBOLECTRIC, buildEnvironments = [BuildEnvironment.BAZEL])
   fun testStateFragment_arabicContentLang_feedback_isInArabic() {
+    setUpTestWithStudyOff()
     updateContentLanguage(profileId, OppiaLanguage.ARABIC)
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
       startPlayingExploration()
@@ -1795,6 +1854,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ROBOLECTRIC, buildEnvironments = [BuildEnvironment.BAZEL])
   fun testStateFragment_arabicContentLang_thenEnglish_feedback_isInArabic() {
+    setUpTestWithStudyOff()
     updateContentLanguage(profileId, OppiaLanguage.ENGLISH)
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
       startPlayingExploration()
@@ -1813,6 +1873,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ROBOLECTRIC) // TODO(#3858): Enable for Espresso.
   fun testStateFragment_english_multipleChoice_optionsAreInEnglish() {
+    setUpTestWithStudyOff()
     updateContentLanguage(profileId, OppiaLanguage.ENGLISH)
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
       startPlayingExploration()
@@ -1834,6 +1895,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ROBOLECTRIC) // TODO(#3858): Enable for Espresso.
   fun testStateFragment_english_multipleChoice_submittedAnswer_answerIsInEnglish() {
+    setUpTestWithStudyOff()
     updateContentLanguage(profileId, OppiaLanguage.ENGLISH)
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
       startPlayingExploration()
@@ -1851,6 +1913,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ROBOLECTRIC, buildEnvironments = [BuildEnvironment.BAZEL])
   fun testStateFragment_arabic_multipleChoice_optionsAreInArabic() {
+    setUpTestWithStudyOff()
     updateContentLanguage(profileId, OppiaLanguage.ARABIC)
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
       startPlayingExploration()
@@ -1873,6 +1936,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ROBOLECTRIC, buildEnvironments = [BuildEnvironment.BAZEL])
   fun testStateFragment_arabic_multipleChoice_submittedAnswer_answerIsInArabic() {
+    setUpTestWithStudyOff()
     updateContentLanguage(profileId, OppiaLanguage.ARABIC)
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
       startPlayingExploration()
@@ -1891,6 +1955,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ROBOLECTRIC, buildEnvironments = [BuildEnvironment.BAZEL])
   fun testStateFragment_arabic_multipleChoice_submittedAnswer_switchToEnglish_answerIsInArabic() {
+    setUpTestWithStudyOff()
     updateContentLanguage(profileId, OppiaLanguage.ARABIC)
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
       startPlayingExploration()
@@ -1910,6 +1975,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ROBOLECTRIC) // TODO(#3858): Enable for Espresso.
   fun testStateFragment_english_itemSelection_optionsAreInEnglish() {
+    setUpTestWithStudyOff()
     updateContentLanguage(profileId, OppiaLanguage.ENGLISH)
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
       startPlayingExploration()
@@ -1933,6 +1999,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ROBOLECTRIC) // TODO(#3858): Enable for Espresso.
   fun testStateFragment_english_itemSelection_submittedAnswer_answerIsInEnglish() {
+    setUpTestWithStudyOff()
     updateContentLanguage(profileId, OppiaLanguage.ENGLISH)
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
       startPlayingExploration()
@@ -1955,6 +2022,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ROBOLECTRIC, buildEnvironments = [BuildEnvironment.BAZEL])
   fun testStateFragment_arabic_itemSelection_optionsAreInArabic() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -1979,6 +2047,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ROBOLECTRIC, buildEnvironments = [BuildEnvironment.BAZEL])
   fun testStateFragment_arabic_itemSelection_submittedAnswer_answerIsInArabic() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -2001,6 +2070,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ROBOLECTRIC, buildEnvironments = [BuildEnvironment.BAZEL])
   fun testStateFragment_arabic_itemSelection_submittedAnswer_switchToEnglish_answerIsInArabic() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -2024,6 +2094,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ROBOLECTRIC) // TODO(#3858): Enable for Espresso.
   fun testStateFragment_english_numericInput_submitAnswer_answerMatchesSubmission() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -2045,6 +2116,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ROBOLECTRIC, buildEnvironments = [BuildEnvironment.BAZEL])
   fun testStateFragment_arabic_numericInput_submitAnswer_answerMatchesSubmission() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -2066,6 +2138,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ROBOLECTRIC) // TODO(#3858): Enable for Espresso.
   fun testStateFragment_english_ratioInput_placeholderIsInEnglish() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -2084,6 +2157,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ROBOLECTRIC) // TODO(#3858): Enable for Espresso.
   fun testStateFragment_english_ratioInput_submitAnswer_answerMatchesSubmission() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -2106,6 +2180,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ROBOLECTRIC, buildEnvironments = [BuildEnvironment.BAZEL])
   fun testStateFragment_arabic_ratioInput_placeholderIsInArabic() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -2125,6 +2200,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ROBOLECTRIC, buildEnvironments = [BuildEnvironment.BAZEL])
   fun testStateFragment_arabic_ratioInput_submitAnswer_answerMatchesSubmission() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -2147,6 +2223,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ROBOLECTRIC) // TODO(#3858): Enable for Espresso.
   fun testStateFragment_english_textInput_placeholderIsInEnglish() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -2166,6 +2243,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ROBOLECTRIC) // TODO(#3858): Enable for Espresso.
   fun testStateFragment_english_textInput_submitAnswer_answerMatchesSubmission() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -2189,6 +2267,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ROBOLECTRIC, buildEnvironments = [BuildEnvironment.BAZEL])
   fun testStateFragment_arabic_textInput_placeholderIsInArabic() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -2209,6 +2288,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ROBOLECTRIC, buildEnvironments = [BuildEnvironment.BAZEL])
   fun testStateFragment_arabic_textInput_submitAnswer_answerMatchesSubmission() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -2232,6 +2312,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ROBOLECTRIC, buildEnvironments = [BuildEnvironment.BAZEL])
   fun testStateFragment_arabic_textInput_submitAnswer_switchToEnglish_answerDoesNotChange() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -2256,6 +2337,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ROBOLECTRIC) // TODO(#3858): Enable for Espresso.
   fun testStateFragment_english_dragAndDrop_optionsAreInEnglish() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -2284,6 +2366,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ESPRESSO, buildEnvironments = [BuildEnvironment.BAZEL])
   fun testStateFragment_english_dragAndDrop_submittedAnswer_answerIsInEnglish() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -2314,6 +2397,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ROBOLECTRIC, buildEnvironments = [BuildEnvironment.BAZEL])
   fun testStateFragment_portuguese_dragAndDrop_optionsAreInPortuguese() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -2342,6 +2426,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ESPRESSO, buildEnvironments = [BuildEnvironment.BAZEL])
   fun testStateFragment_portuguese_dragAndDrop_submittedAnswer_answerIsInPortuguese() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -2372,6 +2457,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ESPRESSO, buildEnvironments = [BuildEnvironment.BAZEL])
   fun testStateFragment_portuguese_dragAndDrop_submittedAnswer_switchToEnglish_answerIsInPt() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -2404,6 +2490,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ESPRESSO, buildEnvironments = [BuildEnvironment.BAZEL])
   fun testStateFragment_playWholeLesson_inArabic_hasReturnToTopicButton() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
 
@@ -2417,17 +2504,130 @@ class StateFragmentTest {
     }
   }
 
-  // TODO: Add tests
-  // - testStateFragment_studyOff_inEnglish_doesNotHaveSwitchToSwahiliButton
-  // - testStateFragment_studyOn_inEnglish_lessonWithoutSwahili_doesNotHaveSwitchToSwahiliButton
-  // - testStateFragment_studyOn_inEnglish_hasSwitchToSwahiliButton
-  // - testStateFragment_studyOn_inSwahili_hasSwitchToEnglishButton
-  // - testStateFragment_inEnglish_clickSwitchToSwahili_contentIsInSwahili
-  // - testStateFragment_inSwahili_clickSwitchToEnglish_contentIsInEnglish
-  // - testStateFragment_inEnglish_clickSwitchToSwahili_thenBackToEnglish_contentIsInEnglish
+  // TODO(#1612): Enable for Robolectric.
+  @Test
+  @RunOn(buildEnvironments = [BuildEnvironment.BAZEL])
+  fun testStateFragment_studyOff_inEnglish_doesNotHaveSwitchToSwahiliButton() {
+    setUpTestWithStudyOff()
+    launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
+      startPlayingExploration()
+
+      // Verify that the "switch to Swahili" button is gone since the study is off.
+      onView(withId(R.id.quick_switch_exploration_language_button_container))
+        .check(matches(withEffectiveVisibility(GONE)))
+    }
+  }
+
+  // TODO(#1612): Enable for Robolectric.
+  @Test
+  @RunOn(buildEnvironments = [BuildEnvironment.BAZEL])
+  fun testStateFragment_studyOn_inEnglish_lessonWithoutSwahili_doesNotHaveSwitchToSwahiliButton() {
+    setUpTestWithStudyOn()
+    launchForExploration(FRACTIONS_EXPLORATION_ID_1, shouldSavePartialProgress = false).use {
+      startPlayingExploration()
+
+      // Verify that the "switch to Swahili" button is gone since the loaded exploration doesn't
+      // have Swahili translations.
+      onView(withId(R.id.quick_switch_exploration_language_button_container))
+        .check(matches(withEffectiveVisibility(GONE)))
+    }
+  }
+
+  // TODO(#1612): Enable for Robolectric.
+  @Test
+  @RunOn(buildEnvironments = [BuildEnvironment.BAZEL])
+  fun testStateFragment_studyOn_inEnglish_hasSwitchToSwahiliButton() {
+    setUpTestWithStudyOn()
+    launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
+      startPlayingExploration()
+
+      // Verify that the "switch to Swahili" button is visible since the study is on & there are
+      // Swahili translations in the loaded exploration.
+      onView(withId(R.id.quick_switch_exploration_language_button_container))
+        .check(matches(isDisplayed()))
+      onView(withId(R.id.quick_switch_exploration_language_button))
+        .check(matches(withText("Switch lesson to Swahili")))
+    }
+  }
+
+  // TODO(#1612): Enable for Robolectric.
+  @Test
+  @RunOn(buildEnvironments = [BuildEnvironment.BAZEL])
+  fun testStateFragment_studyOn_inSwahili_hasSwitchToEnglishButton() {
+    setUpTestWithStudyOn()
+    updateContentLanguage(profileId, OppiaLanguage.SWAHILI)
+    launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
+      startPlayingExploration()
+
+      // The button should allow switching back to English if Swahili is already loaded.
+      onView(withId(R.id.quick_switch_exploration_language_button_container))
+        .check(matches(isDisplayed()))
+      onView(withId(R.id.quick_switch_exploration_language_button))
+        .check(matches(withText("Switch lesson to English")))
+    }
+  }
+
+  // TODO(#1612): Enable for Robolectric.
+  @Test
+  @RunOn(TestPlatform.ESPRESSO, buildEnvironments = [BuildEnvironment.BAZEL])
+  fun testStateFragment_inEnglish_clickSwitchToSwahili_contentIsInSwahili() {
+    setUpTestWithStudyOn()
+    launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
+      startPlayingExploration()
+
+      onView(withId(R.id.quick_switch_exploration_language_button)).perform(click())
+      testCoroutineDispatchers.runCurrent()
+
+      // Switching the language to Swahili should result in both the button & text being updated.
+      onView(withId(R.id.quick_switch_exploration_language_button))
+        .check(matches(withText("Switch lesson to English")))
+      verifyContentContains("Ni sehemu gani inayowakilisha nusu ya kitu?")
+    }
+  }
+
+  // TODO(#1612): Enable for Robolectric.
+  @Test
+  @RunOn(TestPlatform.ESPRESSO, buildEnvironments = [BuildEnvironment.BAZEL])
+  fun testStateFragment_inSwahili_clickSwitchToEnglish_contentIsInEnglish() {
+    setUpTestWithStudyOn()
+    updateContentLanguage(profileId, OppiaLanguage.SWAHILI)
+    launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
+      startPlayingExploration()
+
+      onView(withId(R.id.quick_switch_exploration_language_button)).perform(click())
+      testCoroutineDispatchers.runCurrent()
+
+      // Switching the language to English should result in both the button & text being updated.
+      onView(withId(R.id.quick_switch_exploration_language_button))
+        .check(matches(withText("Switch lesson to Swahili")))
+      verifyContentContains("What fraction represents half of something?")
+    }
+  }
+
+  // TODO(#1612): Enable for Robolectric.
+  @Test
+  @RunOn(TestPlatform.ESPRESSO, buildEnvironments = [BuildEnvironment.BAZEL])
+  fun testStateFragment_inEnglish_clickSwitchToSwahili_thenBackToEnglish_contentIsInEnglish() {
+    setUpTestWithStudyOn()
+    launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
+      startPlayingExploration()
+
+      // Switch to Swahili, then back to English.
+      onView(withId(R.id.quick_switch_exploration_language_button)).perform(click())
+      testCoroutineDispatchers.runCurrent()
+      onView(withId(R.id.quick_switch_exploration_language_button)).perform(click())
+      testCoroutineDispatchers.runCurrent()
+
+      // Switching from English to Swahili, then back, should result in content being in English.
+      onView(withId(R.id.quick_switch_exploration_language_button))
+        .check(matches(withText("Switch lesson to Swahili")))
+      verifyContentContains("What fraction represents half of something?")
+    }
+  }
 
   @Test
   fun testStateFragment_mathInteractions_numericExp_matchesExactly_canSubmitCorrectAnswer() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
 
@@ -2443,6 +2643,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_numericExp_matchesExactly_diffOrder_answerIsWrong() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
 
@@ -2458,6 +2659,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_numericExp_matchesExactly_diffElems_answerIsWrong() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
 
@@ -2473,6 +2675,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_numericExp_matchesExactly_diffValue_answerIsWrong() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
 
@@ -2488,6 +2691,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_numericExp_matchesUpTo_canSubmitCorrectAnswer() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playThroughMathInteractionExplorationState1()
@@ -2504,6 +2708,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_numericExp_matchesUpTo_diffOrder_answerIsCorrect() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playThroughMathInteractionExplorationState1()
@@ -2521,6 +2726,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_numericExp_matchesUpTo_diffElems_answerIsWrong() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playThroughMathInteractionExplorationState1()
@@ -2537,6 +2743,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_numericExp_matchesUpTo_diffValue_answerIsWrong() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playThroughMathInteractionExplorationState1()
@@ -2553,6 +2760,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_numericExp_equivalence_canSubmitCorrectAnswer() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState2()
@@ -2569,6 +2777,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_numericExp_equivalence_diffOrder_answerIsCorrect() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState2()
@@ -2586,6 +2795,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_numericExp_equivalence_diffElems_answerIsCorrect() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState2()
@@ -2603,6 +2813,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_numericExp_equivalence_diffValue_answerIsWrong() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState2()
@@ -2619,6 +2830,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_numericExp_answerWithDivideByZero_displaysError() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
 
@@ -2631,6 +2843,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_numericExp_answerWithVariable_displaysError() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
 
@@ -2647,6 +2860,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_numericExp_validAns_submissionDisplaysLatex() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use { scenario ->
       startPlayingExploration()
       playThroughMathInteractionExplorationState1()
@@ -2670,6 +2884,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_numericExp_validAns_divAsFrac_submissionDisplaysLatex() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use { scenario ->
       startPlayingExploration()
 
@@ -2694,6 +2909,7 @@ class StateFragmentTest {
   @Test
   @RunOn(buildEnvironments = [BuildEnvironment.BAZEL])
   fun testStateFragment_mathInteractions_numericExp_validAns_english_submissionHasA11yAnswer() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playThroughMathInteractionExplorationState1()
@@ -2711,6 +2927,7 @@ class StateFragmentTest {
   @Test
   @RunOn(buildEnvironments = [BuildEnvironment.BAZEL])
   fun testStateFragment_mathInteractions_numericExp_validAns_divAsFrac_submissionHasA11yAnswer() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
 
@@ -2727,6 +2944,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ROBOLECTRIC, buildEnvironments = [BuildEnvironment.BAZEL])
   fun testStateFragment_mathInteractions_numericExp_validAns_arabic_submissionHasA11yAnswer() {
+    setUpTestWithStudyOff()
     updateContentLanguage(profileId, OppiaLanguage.ARABIC)
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
@@ -2745,6 +2963,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_algExp_matchesExactly_canSubmitCorrectAnswer() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState3()
@@ -2761,6 +2980,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_algExp_matchesExactly_diffOrder_answerIsWrong() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState3()
@@ -2777,6 +2997,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_algExp_matchesExactly_diffElems_answerIsWrong() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState3()
@@ -2793,6 +3014,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_algExp_matchesExactly_diffValue_answerIsWrong() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState3()
@@ -2809,6 +3031,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_algExp_matchesUpTo_canSubmitCorrectAnswer() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState4()
@@ -2825,6 +3048,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_algExp_matchesUpTo_diffOrder_answerIsCorrect() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState4()
@@ -2842,6 +3066,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_algExp_matchesUpTo_diffElems_answerIsWrong() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState4()
@@ -2858,6 +3083,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_algExp_matchesUpTo_diffValue_answerIsWrong() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState4()
@@ -2874,6 +3100,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_algExp_equivalence_canSubmitCorrectAnswer() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState5()
@@ -2890,6 +3117,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_algExp_equivalence_diffOrder_answerIsCorrect() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState5()
@@ -2907,6 +3135,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_algExp_equivalence_diffElems_answerIsCorrect() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState5()
@@ -2924,6 +3153,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_algExp_equivalence_diffElems_andVals_answerIsWrong() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState5()
@@ -2941,6 +3171,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_algExp_equivalence_diffOperations_answerIsCorrect() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState5()
@@ -2959,6 +3190,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_algExp_equivalence_diffValue_answerIsWrong() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState5()
@@ -2975,6 +3207,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_algExp_answerWithVariablePower_displaysError() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState3()
@@ -2991,6 +3224,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_algExp_answerWithUnknownVars_displaysError() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState3()
@@ -3005,6 +3239,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_algExp_validAns_submissionDisplaysLatex() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use { scenario ->
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState4()
@@ -3028,6 +3263,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_algExp_validAns_divAsFrac_submissionDisplaysLatex() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use { scenario ->
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState3()
@@ -3053,6 +3289,7 @@ class StateFragmentTest {
   @Test
   @RunOn(buildEnvironments = [BuildEnvironment.BAZEL])
   fun testStateFragment_mathInteractions_algExp_validAns_english_submissionHasA11yAnswer() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState4()
@@ -3074,6 +3311,7 @@ class StateFragmentTest {
   @Test
   @RunOn(buildEnvironments = [BuildEnvironment.BAZEL])
   fun testStateFragment_mathInteractions_algExp_validAns_divAsFrac_submissionHasA11yAnswer() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState3()
@@ -3096,6 +3334,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ROBOLECTRIC, buildEnvironments = [BuildEnvironment.BAZEL])
   fun testStateFragment_mathInteractions_algExp_validAns_arabic_submissionHasA11yAnswer() {
+    setUpTestWithStudyOff()
     updateContentLanguage(profileId, OppiaLanguage.ARABIC)
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
@@ -3114,6 +3353,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_mathEq_matchesExactly_canSubmitCorrectAnswer() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState6()
@@ -3130,6 +3370,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_mathEq_matchesExactly_flipped_answerIsWrong() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState6()
@@ -3147,6 +3388,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_mathEq_matchesExactly_diffOrder_answerIsWrong() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState6()
@@ -3163,6 +3405,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_mathEq_matchesExactly_diffElems_answerIsWrong() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState6()
@@ -3179,6 +3422,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_mathEq_matchesExactly_diffValue_answerIsWrong() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState6()
@@ -3195,6 +3439,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_mathEq_matchesUpTo_canSubmitCorrectAnswer() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState7()
@@ -3211,6 +3456,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_mathEq_matchesUpTo_flipped_answerIsWrong() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState7()
@@ -3228,6 +3474,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_mathEq_matchesUpTo_diffOrder_answerIsCorrect() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState7()
@@ -3245,6 +3492,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_mathEq_matchesUpTo_diffElems_answerIsWrong() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState7()
@@ -3261,6 +3509,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_mathEq_matchesUpTo_diffValue_answerIsWrong() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState7()
@@ -3277,6 +3526,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_mathEq_equivalence_canSubmitCorrectAnswer() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState8()
@@ -3295,6 +3545,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_mathEq_equivalence_flipped_answerIsCorrect() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState8()
@@ -3314,6 +3565,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_mathEq_equivalence_diffOrder_answerIsCorrect() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState8()
@@ -3333,6 +3585,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_mathEq_equivalence_diffElems_answerIsCorrect() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState8()
@@ -3352,6 +3605,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_mathEq_equivalence_diffElems_andVals_answerIsWrong() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState8()
@@ -3369,6 +3623,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_mathEq_equivalence_diffOperations_answerIsCorrect() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState8()
@@ -3389,6 +3644,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_mathEq_equivalence_rearranged_answerIsCorrect() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState8()
@@ -3408,6 +3664,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_mathEq_equivalence_multiple_answerIsWrong() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState8()
@@ -3425,6 +3682,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_mathEq_equivalence_diffValue_answerIsWrong() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState8()
@@ -3441,6 +3699,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_mathEq_answerWithDoubleMult_displaysError() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState6()
@@ -3454,6 +3713,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_mathEq_missingEquals_displaysError() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState6()
@@ -3468,6 +3728,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_mathEq_answerWithUnknownVars_displaysError() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState6()
@@ -3484,6 +3745,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_mathEq_validAns_submissionDisplaysLatex() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use { scenario ->
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState7()
@@ -3507,6 +3769,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_mathInteractions_mathEq_validAns_divAsFrac_submissionDisplaysLatex() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use { scenario ->
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState6()
@@ -3532,6 +3795,7 @@ class StateFragmentTest {
   @Test
   @RunOn(buildEnvironments = [BuildEnvironment.BAZEL])
   fun testStateFragment_mathInteractions_mathEq_validAns_english_submissionHasA11yAnswer() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState7()
@@ -3554,6 +3818,7 @@ class StateFragmentTest {
   @Test
   @RunOn(buildEnvironments = [BuildEnvironment.BAZEL])
   fun testStateFragment_mathInteractions_mathEq_validAns_divAsFrac_submissionHasA11yAnswer() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playUpThroughMathInteractionExplorationState6()
@@ -3578,6 +3843,7 @@ class StateFragmentTest {
   @Test
   @RunOn(TestPlatform.ROBOLECTRIC, buildEnvironments = [BuildEnvironment.BAZEL])
   fun testStateFragment_mathInteractions_mathEq_validAns_arabic_submissionHasA11yAnswer() {
+    setUpTestWithStudyOff()
     updateContentLanguage(profileId, OppiaLanguage.ARABIC)
     launchForExploration(TEST_EXPLORATION_ID_5, shouldSavePartialProgress = false).use {
       startPlayingExploration()
@@ -3599,6 +3865,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_clickContinue_returnToState_doesNotHaveFeedbackBox() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -3613,6 +3880,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_clickContinue_finishNextState_returnToContinue_doesNotHaveFeedbackBox() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -4155,6 +4423,46 @@ class StateFragmentTest {
     return onView(isRoot()).perform(waitForMatch(viewMatcher, 30000L))
   }
 
+  private fun setUpTestWithStudyOn() {
+    TestPlatformParameterModule.forceEnableLearnerStudyAnalytics(true)
+    setUpTest()
+  }
+
+  private fun setUpTestWithStudyOff() {
+    TestPlatformParameterModule.forceEnableLearnerStudyAnalytics(false)
+    setUpTest()
+  }
+
+  private fun setUpTest() {
+    TestPlatformParameterModule.forceEnableContinueButtonAnimation(false)
+    Intents.init()
+    setUpTestApplicationComponent()
+    testCoroutineDispatchers.registerIdlingResource()
+    profileTestHelper.initializeProfiles()
+
+    // Initialize Glide such that all of its executors use the same shared dispatcher pool as the
+    // rest of Oppia so that thread execution can be synchronized via Oppia's test coroutine
+    // dispatchers.
+    val executorService = MockGlideExecutor.newTestExecutor(
+      CoroutineExecutorService(backgroundCoroutineDispatcher)
+    )
+    Glide.init(
+      context,
+      GlideBuilder().setDiskCacheExecutor(executorService)
+        .setAnimationExecutor(executorService)
+        .setSourceExecutor(executorService)
+    )
+
+    // Only initialize the Robolectric shadows when running on Robolectric (and use reflection since
+    // Espresso can't load Robolectric into its classpath).
+    if (isOnRobolectric()) {
+      val dataSource = createAudioDataSource(
+        explorationId = FRACTIONS_EXPLORATION_ID_1, audioFileName = "content-en-ouqm7j21vt8.mp3"
+      )
+      addShadowMediaPlayerException(dataSource, IOException("Test does not have networking"))
+    }
+  }
+
   private fun setUpTestApplicationComponent() {
     ApplicationProvider.getApplicationContext<TestApplication>().inject(this)
   }
@@ -4311,7 +4619,7 @@ class StateFragmentTest {
   @Singleton
   @Component(
     modules = [
-      TestModule::class, RobolectricModule::class, PlatformParameterModule::class,
+      TestModule::class, RobolectricModule::class, TestPlatformParameterModule::class,
       TestDispatcherModule::class, ApplicationModule::class, LoggerModule::class,
       ContinueModule::class, FractionInputModule::class, ItemSelectionInputModule::class,
       MultipleChoiceInputModule::class, NumberWithUnitsRuleModule::class,
diff --git a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditFragmentTest.kt
index f7140672f8f..c9f88aa6616 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditFragmentTest.kt
@@ -10,6 +10,9 @@ import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.action.ViewActions.scrollTo
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.intent.Intents
+import androidx.test.espresso.intent.Intents.intended
+import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent
+import androidx.test.espresso.intent.matcher.IntentMatchers.hasExtra
 import androidx.test.espresso.matcher.RootMatchers.isDialog
 import androidx.test.espresso.matcher.ViewMatchers.isChecked
 import androidx.test.espresso.matcher.ViewMatchers.isClickable
@@ -39,6 +42,7 @@ import org.oppia.android.app.application.ApplicationStartupListenerModule
 import org.oppia.android.app.application.testing.TestingBuildFlavorModule
 import org.oppia.android.app.devoptions.DeveloperOptionsModule
 import org.oppia.android.app.devoptions.DeveloperOptionsStarterModule
+import org.oppia.android.app.devoptions.markchapterscompleted.MarkChaptersCompletedActivity
 import org.oppia.android.app.player.state.itemviewmodel.SplitScreenInteractionModule
 import org.oppia.android.app.shim.ViewBindingShimModule
 import org.oppia.android.app.testing.ProfileEditFragmentTestActivity
@@ -381,10 +385,68 @@ class ProfileEditFragmentTest {
     }
   }
 
-  // TODO: Add tests.
-  // - testProfileEdit_studyOff_doesNotHaveMarkChaptersCompletedButton
-  // - testProfileEdit_studyOn_hasMarkChaptersCompletedButton
-  // - testProfileEdit_studyOn_clickMarkChapsCompleted_opensMarkCompleteActivityForProfile (include verifying the notice)
+  @Test
+  fun testProfileEdit_studyOff_doesNotHaveMarkChaptersCompletedButton() {
+    TestPlatformParameterModule.forceEnableLearnerStudyAnalytics(false)
+    launch<ProfileEditFragmentTestActivity>(
+      ProfileEditFragmentTestActivity.createProfileEditFragmentTestActivity(
+        context = context,
+        profileId = 0
+      )
+    ).use {
+      testCoroutineDispatchers.runCurrent()
+      onView(withId(R.id.profile_mark_chapters_for_completion_button))
+        .check(matches(not(isDisplayed())))
+    }
+  }
+
+  @Test
+  fun testProfileEdit_studyOn_hasMarkChaptersCompletedButton() {
+    TestPlatformParameterModule.forceEnableLearnerStudyAnalytics(true)
+    launch<ProfileEditFragmentTestActivity>(
+      ProfileEditFragmentTestActivity.createProfileEditFragmentTestActivity(
+        context = context,
+        profileId = 0
+      )
+    ).use {
+      testCoroutineDispatchers.runCurrent()
+      onView(withId(R.id.profile_mark_chapters_for_completion_button)).check(matches(isDisplayed()))
+    }
+  }
+
+  @Test
+  fun testProfileEdit_studyOn_landscape_hasMarkChaptersCompletedButton() {
+    TestPlatformParameterModule.forceEnableLearnerStudyAnalytics(true)
+    launch<ProfileEditFragmentTestActivity>(
+      ProfileEditFragmentTestActivity.createProfileEditFragmentTestActivity(
+        context = context,
+        profileId = 0
+      )
+    ).use {
+      testCoroutineDispatchers.runCurrent()
+      onView(isRoot()).perform(orientationLandscape())
+      onView(withId(R.id.profile_mark_chapters_for_completion_button)).check(matches(isDisplayed()))
+    }
+  }
+
+  @Test
+  fun testProfileEdit_studyOn_clickMarkChapsCompleted_opensMarkCompleteActivityForProfile() {
+    TestPlatformParameterModule.forceEnableLearnerStudyAnalytics(true)
+    launch<ProfileEditFragmentTestActivity>(
+      ProfileEditFragmentTestActivity.createProfileEditFragmentTestActivity(
+        context = context,
+        profileId = 0
+      )
+    ).use {
+      testCoroutineDispatchers.runCurrent()
+
+      onView(withId(R.id.profile_mark_chapters_for_completion_button)).perform(click())
+
+      intended(hasComponent(MarkChaptersCompletedActivity::class.java.name))
+      intended(hasExtra("MarkChaptersCompletedActivity.profile_id", 0))
+      intended(hasExtra("MarkChaptersCompletedActivity.show_confirmation_notice", true))
+    }
+  }
 
   @Singleton
   @Component(
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 6f029137f01..5f5cf703176 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
@@ -3,7 +3,9 @@ package org.oppia.android.app.player.state
 import android.app.Application
 import android.content.Context
 import android.text.Spannable
+import android.text.Spanned
 import android.text.style.ClickableSpan
+import android.text.style.ImageSpan
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
@@ -77,6 +79,7 @@ import org.oppia.android.app.model.WrittenTranslationLanguageSelection
 import org.oppia.android.app.player.exploration.TAG_HINTS_AND_SOLUTION_DIALOG
 import org.oppia.android.app.player.state.itemviewmodel.SplitScreenInteractionModule
 import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel
+import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel.ViewType.ALGEBRAIC_EXPRESSION_INPUT_INTERACTION
 import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel.ViewType.CONTINUE_INTERACTION
 import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel.ViewType.CONTINUE_NAVIGATION_BUTTON
 import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel.ViewType.FRACTION_INPUT_INTERACTION
@@ -84,8 +87,10 @@ import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel.ViewT
 import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel.ViewType.NUMERIC_EXPRESSION_INPUT_INTERACTION
 import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel.ViewType.NUMERIC_INPUT_INTERACTION
 import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel.ViewType.PREVIOUS_RESPONSES_HEADER
+import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel.ViewType.RATIO_EXPRESSION_INPUT_INTERACTION
 import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel.ViewType.SELECTION_INTERACTION
 import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel.ViewType.SUBMIT_ANSWER_BUTTON
+import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel.ViewType.TEXT_INPUT_INTERACTION
 import org.oppia.android.app.player.state.testing.StateFragmentTestActivity
 import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView
 import org.oppia.android.app.shim.ViewBindingShimModule
@@ -132,6 +137,7 @@ import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule
 import org.oppia.android.testing.BuildEnvironment
 import org.oppia.android.testing.OppiaTestRule
 import org.oppia.android.testing.RunOn
+import org.oppia.android.testing.TestImageLoaderModule
 import org.oppia.android.testing.TestLogReportingModule
 import org.oppia.android.testing.data.DataProviderTestMonitor
 import org.oppia.android.testing.environment.TestEnvironmentConfig
@@ -163,8 +169,8 @@ import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule
 import org.oppia.android.util.networking.NetworkConnectionDebugUtilModule
 import org.oppia.android.util.networking.NetworkConnectionUtilDebugModule
 import org.oppia.android.util.parser.html.HtmlParserEntityTypeModule
-import org.oppia.android.util.parser.image.GlideImageLoaderModule
 import org.oppia.android.util.parser.image.ImageParsingModule
+import org.oppia.android.util.parser.image.TestGlideImageLoader
 import org.oppia.android.util.threading.BackgroundDispatcher
 import org.robolectric.annotation.Config
 import org.robolectric.annotation.LooperMode
@@ -184,43 +190,23 @@ import javax.inject.Singleton
 @LooperMode(LooperMode.Mode.PAUSED)
 @Config(application = StateFragmentLocalTest.TestApplication::class, qualifiers = "port-xxhdpi")
 class StateFragmentLocalTest {
-  @get:Rule
-  val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
-
-  @get:Rule
-  val oppiaTestRule = OppiaTestRule()
+  @get:Rule val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
+  @get:Rule val oppiaTestRule = OppiaTestRule()
 
   private val AUDIO_URL_1 =
     createAudioUrl(explorationId = "MjZzEVOG47_1", audioFileName = "content-en-ouqm7j21vt8.mp3")
   private val audioDataSource1 = DataSource.toDataSource(AUDIO_URL_1, /* headers= */ null)
 
-  @Inject
-  lateinit var profileTestHelper: ProfileTestHelper
-
-  @Inject
-  lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
-
-  @Inject
-  lateinit var context: Context
-
-  @Inject
-  @field:BackgroundDispatcher
-  lateinit var backgroundCoroutineDispatcher: CoroutineDispatcher
-
-  @Inject
-  lateinit var editTextInputAction: EditTextInputAction
-
-  @Inject
-  lateinit var accessibilityManager: FakeAccessibilityService
-
-  @Inject
-  lateinit var translationController: TranslationController
-
-  @Inject
-  lateinit var monitorFactory: DataProviderTestMonitor.Factory
-
-  @Inject
-  lateinit var fakeAccessibilityService: FakeAccessibilityService
+  @Inject lateinit var profileTestHelper: ProfileTestHelper
+  @Inject lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
+  @Inject lateinit var context: Context
+  @field:[Inject BackgroundDispatcher] lateinit var backgroundDispatcher: CoroutineDispatcher
+  @Inject lateinit var editTextInputAction: EditTextInputAction
+  @Inject lateinit var accessibilityManager: FakeAccessibilityService
+  @Inject lateinit var translationController: TranslationController
+  @Inject lateinit var monitorFactory: DataProviderTestMonitor.Factory
+  @Inject lateinit var fakeAccessibilityService: FakeAccessibilityService
+  @Inject lateinit var testGlideImageLoader: TestGlideImageLoader
 
   private val profileId = ProfileId.newBuilder().apply { internalId = 1 }.build()
   private val solutionIndex: Int = 4
@@ -233,7 +219,7 @@ class StateFragmentLocalTest {
     // rest of Oppia so that thread execution can be synchronized via Oppia's test coroutine
     // dispatchers.
     val executorService = MockGlideExecutor.newTestExecutor(
-      CoroutineExecutorService(backgroundCoroutineDispatcher)
+      CoroutineExecutorService(backgroundDispatcher)
     )
     Glide.init(
       context,
@@ -441,7 +427,7 @@ class StateFragmentLocalTest {
     launchForExploration(TEST_EXPLORATION_ID_2).use {
       startPlayingExploration()
       playThroughTestState1()
-      submitFractionAnswer(answerText = "1/2")
+      submitFractionAnswer(text = "1/2")
 
       scrollToViewType(CONTINUE_NAVIGATION_BUTTON)
       testCoroutineDispatchers.advanceTimeBy(TimeUnit.SECONDS.toMillis(45))
@@ -1554,15 +1540,149 @@ class StateFragmentLocalTest {
     }
   }
 
-  // TODO: Add tests
-  // - testStateFragment_stateWithFractionInput_showSolution_exclusive_solutionHasCorrectAnswerText
-  // - testStateFragment_stateWithNumericInput_showSolution_exclusive_solutionHasCorrectAnswerText
-  // - testStateFragment_stateWithTextInput_showSolution_exclusive_solutionHasCorrectAnswerText
-  // - testStateFragment_stateWithRatioInput_showSolution_notExclusive_solutionHasCorrectAnswerText
-  // - testStateFragment_stateWithNumericExpr_showSolution_solutionHasCorrectHtmlAnswerText
-  // - testStateFragment_stateWithNumericExpr_showSolution_solutionHasCorrectAnswerContentDescription
-  // - testStateFragment_stateWithAlgebraicExpr_showSolution_solutionHasCorrectHtmlAnswerText
-  // - testStateFragment_stateWithAlgebraicEq_showSolution_solutionHasCorrectHtmlAnswerText
+  @Test
+  fun testStateFragment_stateWithFractionInp_showSolution_exclusive_solutionHasCorrectAnswerText() {
+    launchForExploration(TEST_EXPLORATION_ID_2).use { scenario ->
+      startPlayingExploration()
+      playThroughTestState1()
+      produceAndViewFirstHint(hintPosition = 0) { submitWrongAnswerToTestExpState2() }
+
+      produceAndViewSolution(scenario) { submitWrongAnswerToTestExpState2() }
+
+      // Verify that the solution answer text is correctly generated.
+      onView(withId(R.id.solution_correct_answer))
+        .check(matches(withText("The only solution is: 1/2")))
+    }
+  }
+
+  @Test
+  fun testStateFragment_stateWithNumericInp_showSolution_exclusive_solutionHasCorrectAnswerText() {
+    launchForExploration(TEST_EXPLORATION_ID_2).use { scenario ->
+      startPlayingExploration()
+      playThroughTestState1()
+      playThroughTestState2()
+      playThroughTestState3()
+      playThroughTestState4()
+      playThroughTestState5()
+      produceAndViewFirstHint(hintPosition = 0) { submitWrongAnswerToTestExpState6() }
+
+      produceAndViewSolution(scenario) { submitWrongAnswerToTestExpState6() }
+
+      // Verify that the solution answer text is correctly generated.
+      onView(withId(R.id.solution_correct_answer))
+        .check(matches(withText("The only solution is: 121")))
+    }
+  }
+
+  @Test
+  fun testStateFragment_stateWithNumericExpr_showSolution_solutionHasCorrectAnswerContentDesc() {
+    launchForExploration(TEST_EXPLORATION_ID_2).use { scenario ->
+      startPlayingExploration()
+      playThroughTestState1()
+      playThroughTestState2()
+      playThroughTestState3()
+      playThroughTestState4()
+      playThroughTestState5()
+      produceAndViewFirstHint(hintPosition = 0) { submitWrongAnswerToTestExpState6() }
+
+      produceAndViewSolution(scenario) { submitWrongAnswerToTestExpState6() }
+
+      // Verify that the solution answer text is correctly generated.
+      onView(withId(R.id.solution_correct_answer))
+        .check(matches(withContentDescription("The only solution is: 121")))
+    }
+  }
+
+  @Test
+  fun testStateFragment_stateWithRatioInp_showSolution_notExclusive_solutionHasCorrectAnswerText() {
+    launchForExploration(TEST_EXPLORATION_ID_2).use { scenario ->
+      startPlayingExploration()
+      playThroughTestState1()
+      playThroughTestState2()
+      playThroughTestState3()
+      playThroughTestState4()
+      playThroughTestState5()
+      playThroughTestState6()
+      produceAndViewFirstHint(hintPosition = 0) { submitWrongAnswerToTestExpState7() }
+
+      produceAndViewSolution(scenario) { submitWrongAnswerToTestExpState7() }
+
+      // Verify that the solution answer text is correctly generated.
+      onView(withId(R.id.solution_correct_answer)).check(matches(withText("One solution is: 4:5")))
+    }
+  }
+
+  @Test
+  fun testStateFragment_stateWithTextInput_showSolution_exclusive_solutionHasCorrectAnswerText() {
+    launchForExploration(TEST_EXPLORATION_ID_2).use { scenario ->
+      startPlayingExploration()
+      playThroughTestState1()
+      playThroughTestState2()
+      playThroughTestState3()
+      playThroughTestState4()
+      playThroughTestState5()
+      playThroughTestState6()
+      playThroughTestState7()
+      produceAndViewFirstHint(hintPosition = 0) { submitWrongAnswerToTestExpState8() }
+
+      produceAndViewSolution(scenario) { submitWrongAnswerToTestExpState8() }
+
+      // Verify that the solution answer text is correctly generated.
+      onView(withId(R.id.solution_correct_answer))
+        .check(matches(withText("The only solution is: finnish")))
+    }
+  }
+
+  @Test
+  fun testStateFragment_stateWithAlgebraicExpr_showSolution_solutionHasCorrectHtmlAnswerText() {
+    launchForExploration(TEST_EXPLORATION_ID_5).use { scenario ->
+      // Play through the first three states.
+      startPlayingExploration()
+      playThroughExp5NumericExpressionState()
+      playThroughExp5NumericExpressionState()
+      playThroughExp5NumericExpressionState()
+
+      produceAndViewSolutionAsFirstHint(scenario) { submitWrongAnswerToTestExp5State4() }
+
+      // Verify that the solution answer text is correctly generated.
+      onView(withId(R.id.solution_correct_answer))
+        .check(matches(withText(containsString("One solution is:"))))
+      scenario.onActivity { activity ->
+        val dialogFragment =
+          activity.supportFragmentManager.findFragmentByTag("HINTS_AND_SOLUTION_DIALOG")
+        val htmlTextView =
+          dialogFragment?.view?.findViewById<TextView>(R.id.solution_correct_answer)
+        assertThat(htmlTextView?.getSpans<ImageSpan>()).hasSize(1)
+
+        // Verify that an image drawable was loaded and with the correct LaTeX.
+        val loadedModels = testGlideImageLoader.getLoadedMathDrawables()
+        assertThat(loadedModels.count()).isAtLeast(1)
+        assertThat(loadedModels.last().rawLatex).isEqualTo("x ^ {2} - x - 2")
+        assertThat(loadedModels.last().useInlineRendering).isTrue()
+      }
+    }
+  }
+
+  @Test
+  fun testStateFragment_stateWithAlgebraicExpr_showSolution_solutionHasCorrectHtmlContentDesc() {
+    launchForExploration(TEST_EXPLORATION_ID_5).use { scenario ->
+      // Play through the first three states.
+      startPlayingExploration()
+      playThroughExp5NumericExpressionState()
+      playThroughExp5NumericExpressionState()
+      playThroughExp5NumericExpressionState()
+
+      produceAndViewSolutionAsFirstHint(scenario) { submitWrongAnswerToTestExp5State4() }
+
+      // Verify that the solution answer text is correctly generated.
+      onView(withId(R.id.solution_correct_answer))
+        .check(
+          matches(
+            withContentDescription("One solution is: x raised to the power of 2 minus x minus 2")
+          )
+        )
+    }
+  }
 
   @Test
   @DefineAppLanguageLocaleContext(
@@ -1577,8 +1697,8 @@ class StateFragmentLocalTest {
       startPlayingExploration()
       clickContinueButton()
       // Submit two incorrect answers.
-      submitFractionAnswer(answerText = "1/3")
-      submitFractionAnswer(answerText = "1/4")
+      submitFractionAnswer(text = "1/3")
+      submitFractionAnswer(text = "1/4")
 
       // Reveal the hint.
       openHintsAndSolutionsDialog()
@@ -1603,8 +1723,8 @@ class StateFragmentLocalTest {
       startPlayingExploration()
       clickContinueButton()
       // Submit two incorrect answers.
-      submitFractionAnswer(answerText = "1/3")
-      submitFractionAnswer(answerText = "1/4")
+      submitFractionAnswer(text = "1/3")
+      submitFractionAnswer(text = "1/4")
 
       // Reveal the hint.
       openHintsAndSolutionsDialog()
@@ -1628,8 +1748,8 @@ class StateFragmentLocalTest {
       startPlayingExploration()
       clickContinueButton()
       // Submit two incorrect answers.
-      submitFractionAnswer(answerText = "1/3")
-      submitFractionAnswer(answerText = "1/4")
+      submitFractionAnswer(text = "1/3")
+      submitFractionAnswer(text = "1/4")
 
       // Show the hint.
       openHintsAndSolutionsDialog()
@@ -1657,8 +1777,8 @@ class StateFragmentLocalTest {
       startPlayingExploration()
       clickContinueButton()
       // Submit two incorrect answers.
-      submitFractionAnswer(answerText = "1/3")
-      submitFractionAnswer(answerText = "1/4")
+      submitFractionAnswer(text = "1/3")
+      submitFractionAnswer(text = "1/4")
 
       // Show the hint.
       openHintsAndSolutionsDialog()
@@ -1683,8 +1803,8 @@ class StateFragmentLocalTest {
       startPlayingExploration()
       clickContinueButton()
       // Submit two incorrect answers.
-      submitFractionAnswer(answerText = "1/3")
-      submitFractionAnswer(answerText = "1/4")
+      submitFractionAnswer(text = "1/3")
+      submitFractionAnswer(text = "1/4")
 
       // Reveal the hint.
       openHintsAndSolutionsDialog()
@@ -1711,8 +1831,8 @@ class StateFragmentLocalTest {
       startPlayingExploration()
       clickContinueButton()
       // Submit two incorrect answers.
-      submitFractionAnswer(answerText = "1/3")
-      submitFractionAnswer(answerText = "1/4")
+      submitFractionAnswer(text = "1/3")
+      submitFractionAnswer(text = "1/4")
 
       // Show the hint.
       openHintsAndSolutionsDialog()
@@ -1739,8 +1859,8 @@ class StateFragmentLocalTest {
       startPlayingExploration()
       clickContinueButton()
       // Submit two incorrect answers.
-      submitFractionAnswer(answerText = "1/3")
-      submitFractionAnswer(answerText = "1/4")
+      submitFractionAnswer(text = "1/3")
+      submitFractionAnswer(text = "1/4")
 
       // Show the hint.
       openHintsAndSolutionsDialog()
@@ -2082,7 +2202,7 @@ class StateFragmentLocalTest {
     launchForExploration(TEST_EXPLORATION_ID_2).use { scenario ->
       startPlayingExploration()
       clickContinueButton()
-      produceAndViewNextHint(hintPosition = 0) { submitTwoWrongAnswersToTestExpState2() }
+      produceAndViewFirstHint(hintPosition = 0) { submitWrongAnswerToTestExpState2() }
       produceAndViewSolution(scenario) { submitWrongAnswerToTestExpState2() }
 
       // Click on the link for opening the concept card.
@@ -2137,73 +2257,73 @@ class StateFragmentLocalTest {
 
   private fun playThroughFractionsState2() {
     // Correct answer to 'Matthew gets conned'
-    submitFractionAnswer(answerText = "3/4")
+    submitFractionAnswer(text = "3/4")
     clickContinueNavigationButton()
   }
 
   private fun playThroughFractionsState3() {
     // Correct answer to 'Question 1'
-    submitFractionAnswer(answerText = "4/9")
+    submitFractionAnswer(text = "4/9")
     clickContinueNavigationButton()
   }
 
   private fun playThroughFractionsState4() {
     // Correct answer to 'Question 2'
-    submitFractionAnswer(answerText = "1/4")
+    submitFractionAnswer(text = "1/4")
     clickContinueNavigationButton()
   }
 
   private fun playThroughFractionsState5() {
     // Correct answer to 'Question 3'
-    submitFractionAnswer(answerText = "1/8")
+    submitFractionAnswer(text = "1/8")
     clickContinueNavigationButton()
   }
 
   private fun playThroughFractionsState6() {
     // Correct answer to 'Question 4'
-    submitFractionAnswer(answerText = "1/2")
+    submitFractionAnswer(text = "1/2")
     clickContinueNavigationButton()
   }
 
   private fun playThroughFractionsState7() {
     // Correct answer to 'Question 5' which redirects the learner to 'Thinking in fractions Q1'
-    submitFractionAnswer(answerText = "2/9")
+    submitFractionAnswer(text = "2/9")
     clickContinueNavigationButton()
   }
 
   private fun playThroughFractionsState8() {
     // Correct answer to 'Thinking in fractions Q1'
-    submitFractionAnswer(answerText = "7/9")
+    submitFractionAnswer(text = "7/9")
     clickContinueNavigationButton()
   }
 
   private fun playThroughFractionsState9() {
     // Correct answer to 'Thinking in fractions Q2'
-    submitFractionAnswer(answerText = "4/9")
+    submitFractionAnswer(text = "4/9")
     clickContinueNavigationButton()
   }
 
   private fun playThroughFractionsState10() {
     // Correct answer to 'Thinking in fractions Q3'
-    submitFractionAnswer(answerText = "5/8")
+    submitFractionAnswer(text = "5/8")
     clickContinueNavigationButton()
   }
 
   private fun playThroughFractionsState11() {
     // Correct answer to 'Thinking in fractions Q4' which redirects the learner to 'Final Test A'
-    submitFractionAnswer(answerText = "3/4")
+    submitFractionAnswer(text = "3/4")
     clickContinueNavigationButton()
   }
 
   private fun playThroughFractionsState12() {
     // Correct answer to 'Final Test A' redirects learner to 'Happy ending'
-    submitFractionAnswer(answerText = "2/4")
+    submitFractionAnswer(text = "2/4")
     clickContinueNavigationButton()
   }
 
   private fun playThroughFractionsState12WithWrongAnswer() {
     // Incorrect answer to 'Final Test A' redirects the learner to 'Final Test A second try'
-    submitFractionAnswer(answerText = "1/9")
+    submitFractionAnswer(text = "1/9")
     clickContinueNavigationButton()
   }
 
@@ -2242,7 +2362,7 @@ class StateFragmentLocalTest {
   }
 
   private fun playThroughTestState2() {
-    submitFractionAnswer(answerText = "1/2")
+    submitFractionAnswer(text = "1/2")
     clickContinueNavigationButton()
   }
 
@@ -2264,6 +2384,21 @@ class StateFragmentLocalTest {
     clickContinueNavigationButton()
   }
 
+  private fun playThroughTestState6() {
+    submitNumericInput(text = "121")
+    clickContinueNavigationButton()
+  }
+
+  private fun playThroughTestState7() {
+    submitRatioInput(text = "4:5")
+    clickContinueNavigationButton()
+  }
+
+  private fun playThroughExp5NumericExpressionState() {
+    submitNumericExpressionAnswer(text = "1 + 2")
+    clickContinueNavigationButton()
+  }
+
   private fun clickContinueNavigationButton() {
     onView(withId(R.id.state_recycler_view)).perform(scrollToViewType(CONTINUE_NAVIGATION_BUTTON))
     testCoroutineDispatchers.runCurrent()
@@ -2335,13 +2470,35 @@ class StateFragmentLocalTest {
     testCoroutineDispatchers.runCurrent()
   }
 
-  private fun typeFractionAnswer(answerText: String) {
+  private fun typeFractionAnswer(text: String) {
     onView(withId(R.id.state_recycler_view)).perform(scrollToViewType(FRACTION_INPUT_INTERACTION))
-    typeTextIntoInteraction(answerText, interactionViewId = R.id.fraction_input_interaction_view)
+    typeTextIntoInteraction(text, interactionViewId = R.id.fraction_input_interaction_view)
+  }
+
+  private fun submitFractionAnswer(text: String) {
+    typeFractionAnswer(text)
+    clickSubmitAnswerButton()
+  }
+
+  private fun typeNumericExpressionAnswer(text: String) {
+    onView(withId(R.id.state_recycler_view))
+      .perform(scrollToViewType(NUMERIC_EXPRESSION_INPUT_INTERACTION))
+    typeTextIntoInteraction(text, interactionViewId = R.id.math_expression_input_interaction_view)
   }
 
-  private fun submitFractionAnswer(answerText: String) {
-    typeFractionAnswer(answerText)
+  private fun submitNumericExpressionAnswer(text: String) {
+    typeNumericExpressionAnswer(text)
+    clickSubmitAnswerButton()
+  }
+
+  private fun typeAlgebraicExpressionAnswer(text: String) {
+    onView(withId(R.id.state_recycler_view))
+      .perform(scrollToViewType(ALGEBRAIC_EXPRESSION_INPUT_INTERACTION))
+    typeTextIntoInteraction(text, interactionViewId = R.id.math_expression_input_interaction_view)
+  }
+
+  private fun submitAlgebraicExpressionAnswer(text: String) {
+    typeAlgebraicExpressionAnswer(text)
     clickSubmitAnswerButton()
   }
 
@@ -2374,6 +2531,27 @@ class StateFragmentLocalTest {
     clickSubmitAnswerButton()
   }
 
+  private fun typeRatioInput(text: String) {
+    onView(withId(R.id.state_recycler_view))
+      .perform(scrollToViewType(RATIO_EXPRESSION_INPUT_INTERACTION))
+    typeTextIntoInteraction(text, interactionViewId = R.id.ratio_input_interaction_view)
+  }
+
+  private fun submitRatioInput(text: String) {
+    typeRatioInput(text)
+    clickSubmitAnswerButton()
+  }
+
+  private fun typeTextInput(text: String) {
+    onView(withId(R.id.state_recycler_view)).perform(scrollToViewType(TEXT_INPUT_INTERACTION))
+    typeTextIntoInteraction(text, interactionViewId = R.id.text_input_interaction_view)
+  }
+
+  private fun submitTextInput(text: String) {
+    typeTextInput(text)
+    clickSubmitAnswerButton()
+  }
+
   private fun typeTextIntoInteraction(text: String, interactionViewId: Int) {
     onView(withId(interactionViewId)).perform(editTextInputAction.appendText(text))
     testCoroutineDispatchers.runCurrent()
@@ -2406,7 +2584,7 @@ class StateFragmentLocalTest {
   }
 
   private fun submitWrongAnswerToFractionsState2() {
-    submitFractionAnswer(answerText = "1/2")
+    submitFractionAnswer(text = "1/2")
   }
 
   private fun submitWrongAnswerToFractionsState2AndWait() {
@@ -2415,7 +2593,7 @@ class StateFragmentLocalTest {
   }
 
   private fun submitWrongAnswerToFractionsState13() {
-    submitFractionAnswer(answerText = "1/9")
+    submitFractionAnswer(text = "1/9")
   }
 
   private fun submitWrongAnswerToFractionsState13AndWait() {
@@ -2450,7 +2628,19 @@ class StateFragmentLocalTest {
   }
 
   private fun submitWrongAnswerToTestExpState2() {
-    submitFractionAnswer(answerText = "1/4")
+    submitFractionAnswer(text = "1/4")
+  }
+
+  private fun submitWrongAnswerToTestExpState6() {
+    submitNumericInput(text = "101")
+  }
+
+  private fun submitWrongAnswerToTestExpState7() {
+    submitRatioInput(text = "5:4")
+  }
+
+  private fun submitWrongAnswerToTestExpState8() {
+    submitTextInput(text = "finish")
   }
 
   private fun submitTwoWrongAnswersToTestExpState2() {
@@ -2458,6 +2648,18 @@ class StateFragmentLocalTest {
     submitWrongAnswerToTestExpState2()
   }
 
+  private fun submitWrongAnswerToTestExp5State4() {
+    submitAlgebraicExpressionAnswer(text = "1 + 2")
+  }
+
+  private fun produceAndViewFirstHint(hintPosition: Int, submitAnswer: () -> Unit) {
+    produceAndViewNextHint(hintPosition) {
+      // Submit the wrong answer twice.
+      submitAnswer()
+      submitAnswer()
+    }
+  }
+
   /**
    * Causes a hint after the first one to be shown (at approximately the specified recycler view
    * index for scrolling purposes), and then reveals it and closes the hints & solutions dialog.
@@ -2469,6 +2671,17 @@ class StateFragmentLocalTest {
     closeHintsAndSolutionsDialog()
   }
 
+  private fun produceAndViewSolutionAsFirstHint(
+    activityScenario: ActivityScenario<StateFragmentTestActivity>,
+    submitAnswer: () -> Unit
+  ) {
+    produceAndViewSolution(activityScenario) {
+      // Submit the wrong answer twice.
+      submitAnswer()
+      submitAnswer()
+    }
+  }
+
   private fun produceAndViewSolution(
     activityScenario: ActivityScenario<StateFragmentTestActivity>,
     submitAnswer: () -> Unit
@@ -2679,6 +2892,11 @@ class StateFragmentLocalTest {
   private fun List<Pair<String, ClickableSpan>>.findMatchingTextOrNull(text: String) =
     find { text in it.first }?.second
 
+  private inline fun <reified T : Any> TextView.getSpans(): List<T> = (text as Spanned).getSpans()
+
+  private inline fun <reified T : Any> Spanned.getSpans(): List<T> =
+    getSpans(/* start= */ 0, /* end= */ length, T::class.java).toList()
+
   // TODO(#89): Move this to a common test application component.
   @Module
   class TestModule {
@@ -2710,7 +2928,7 @@ class StateFragmentLocalTest {
       FractionInputModule::class, ItemSelectionInputModule::class, MultipleChoiceInputModule::class,
       NumberWithUnitsRuleModule::class, NumericInputRuleModule::class, TextInputRuleModule::class,
       DragDropSortInputModule::class, ImageClickInputModule::class, InteractionsModule::class,
-      GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class,
+      GcsResourceModule::class, TestImageLoaderModule::class, ImageParsingModule::class,
       HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class,
       AccessibilityTestModule::class, LogStorageModule::class,
       PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class,
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 34fa43f2ca4..02133abdb74 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
@@ -562,7 +562,7 @@ class AudioPlayerControllerTest {
   fun testPlay_prepared_notReloadingMainContent_notAutoPlaying_studyOn_logsPlayEvent() {
     setUpMediaReadyApplicationWithLearnerStudy()
     val explorationId = TEST_EXPLORATION_ID_5
-    arrangeMediaPlayer(contentId = "test_content_id")
+    arrangeMediaPlayer(contentId = "test_content_id", languageCode = "sw")
     logIntoAnalyticsReadyAdminProfile()
     beginExploration(topicId = "test_topic_id", storyId = "test_story_id", explorationId)
 
@@ -574,6 +574,7 @@ class AudioPlayerControllerTest {
     assertThat(eventLog).isEssentialPriority()
     assertThat(eventLog).hasPlayVoiceOverContextThat {
       hasContentIdThat().isEqualTo("test_content_id")
+      hasLanguageCodeThat().isEqualTo("sw")
       hasExplorationDetailsThat {
         hasTopicIdThat().isEqualTo("test_topic_id")
         hasStoryIdThat().isEqualTo("test_story_id")
@@ -612,19 +613,121 @@ class AudioPlayerControllerTest {
 
     audioPlayerController.play(isPlayingFromAutoPlay = false, reloadingMainContent = false)
 
-    // No event should be logged if outside an exploration and playing audio (such as for
+    // No event should be logged if outside an exploration when playing/pausing audio (such as for
+    // questions).
+    assertThat(fakeAnalyticsEventLogger.noEventsPresent()).isTrue()
+  }
+
+  @Test
+  fun testPause_playing_explicitUserAction_studyOn_logsPauseEvent() {
+    setUpMediaReadyApplicationWithLearnerStudy()
+    val explorationId = TEST_EXPLORATION_ID_5
+    arrangeMediaPlayer(contentId = "test_content_id", languageCode = "sw")
+    logIntoAnalyticsReadyAdminProfile()
+    beginExploration(topicId = "test_topic_id", storyId = "test_story_id", explorationId)
+    audioPlayerController.play(isPlayingFromAutoPlay = false, reloadingMainContent = false)
+
+    audioPlayerController.pause(isFromExplicitUserAction = true)
+
+    // This case corresponds to the user manually pausing audio.
+    val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
+    val exploration = loadExploration(explorationId)
+    assertThat(eventLog).isEssentialPriority()
+    assertThat(eventLog).hasPauseVoiceOverContextThat {
+      hasContentIdThat().isEqualTo("test_content_id")
+      hasLanguageCodeThat().isEqualTo("sw")
+      hasExplorationDetailsThat {
+        hasTopicIdThat().isEqualTo("test_topic_id")
+        hasStoryIdThat().isEqualTo("test_story_id")
+        hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
+        hasVersionThat().isEqualTo(exploration.version)
+        hasStateNameThat().isEqualTo(exploration.initStateName)
+        hasSessionIdThat().isNotEmpty()
+        hasLearnerDetailsThat {
+          hasLearnerIdThat().isNotEmpty()
+          hasInstallationIdThat().isNotEmpty()
+        }
+      }
+    }
+  }
+
+  @Test
+  fun testPause_playing_explicitAction_missingContentId_studyOn_logsPauseEventWithoutContentId() {
+    setUpMediaReadyApplicationWithLearnerStudy()
+    val explorationId = TEST_EXPLORATION_ID_5
+    arrangeMediaPlayer(contentId = null)
+    logIntoAnalyticsReadyAdminProfile()
+    beginExploration(topicId = "test_topic_id", storyId = "test_story_id", explorationId)
+    audioPlayerController.play(isPlayingFromAutoPlay = false, reloadingMainContent = false)
+
+    audioPlayerController.pause(isFromExplicitUserAction = true)
+
+    // If there's no content ID then it'll be missing from the log.
+    val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
+    assertThat(eventLog).hasPauseVoiceOverContextThat().hasContentIdThat().isEmpty()
+  }
+
+  @Test
+  fun testPause_playing_explicitUserAction_outsideExp_studyOn_doesNotLogEvent() {
+    setUpMediaReadyApplicationWithLearnerStudy()
+    arrangeMediaPlayer(contentId = "test_content_id")
+    logIntoAnalyticsReadyAdminProfile()
+    audioPlayerController.play(isPlayingFromAutoPlay = false, reloadingMainContent = false)
+    fakeAnalyticsEventLogger.clearAllEvents() // Remove unrelated events.
+
+    audioPlayerController.pause(isFromExplicitUserAction = true)
+
+    // No event should be logged if outside an exploration when playing/pausing audio (such as for
     // questions).
     assertThat(fakeAnalyticsEventLogger.noEventsPresent()).isTrue()
   }
 
-  // TODO: add/update tests
-  // - Update tests above to include verification for language code.
-  // - testPause_playing_explicitUserAction_studyOn_logsPauseEvent
-  // - testPause_playing_explicitAction_missingContentId_studyOn_logsPauseEventWithoutContentId
-  // - testPause_playing_explicitUserAction_outsideExp_studyOn_doesNotLogEvent
-  // - testPause_playing_notExplicitUserAction_studyOn_doesNotLogEvent
-  // - testPause_notPlaying_explicitUserAction_studyOn_doesNotLogEvent
-  // - testPause_notPlaying_notExplicitUserAction_studyOn_doesNotLogEvent
+  @Test
+  fun testPause_playing_notExplicitUserAction_studyOn_doesNotLogEvent() {
+    setUpMediaReadyApplicationWithLearnerStudy()
+    val explorationId = TEST_EXPLORATION_ID_5
+    arrangeMediaPlayer(contentId = "test_content_id", languageCode = "sw")
+    logIntoAnalyticsReadyAdminProfile()
+    beginExploration(topicId = "test_topic_id", storyId = "test_story_id", explorationId)
+    audioPlayerController.play(isPlayingFromAutoPlay = false, reloadingMainContent = false)
+    fakeAnalyticsEventLogger.clearAllEvents() // Remove unrelated events.
+
+    audioPlayerController.pause(isFromExplicitUserAction = false)
+
+    // Automatic pausing (such as navigating away from a lesson) should not logged an event.
+    // This case corresponds to the user manually pausing audio.
+    assertThat(fakeAnalyticsEventLogger.noEventsPresent()).isTrue()
+  }
+
+  @Test
+  fun testPause_notPlaying_explicitUserAction_studyOn_doesNotLogEvent() {
+    setUpMediaReadyApplicationWithLearnerStudy()
+    val explorationId = TEST_EXPLORATION_ID_5
+    arrangeMediaPlayer(contentId = "test_content_id", languageCode = "sw")
+    logIntoAnalyticsReadyAdminProfile()
+    beginExploration(topicId = "test_topic_id", storyId = "test_story_id", explorationId)
+    fakeAnalyticsEventLogger.clearAllEvents() // Remove unrelated events.
+
+    audioPlayerController.pause(isFromExplicitUserAction = true)
+
+    // Pausing when not actually playing should never log an event since it's an invalid state.
+    assertThat(fakeAnalyticsEventLogger.noEventsPresent()).isTrue()
+  }
+
+  @Test
+  fun testPause_notPlaying_notExplicitUserAction_studyOn_doesNotLogEvent() {
+    setUpMediaReadyApplicationWithLearnerStudy()
+    val explorationId = TEST_EXPLORATION_ID_5
+    arrangeMediaPlayer(contentId = "test_content_id", languageCode = "sw")
+    logIntoAnalyticsReadyAdminProfile()
+    beginExploration(topicId = "test_topic_id", storyId = "test_story_id", explorationId)
+    fakeAnalyticsEventLogger.clearAllEvents() // Remove unrelated events.
+
+    audioPlayerController.pause(isFromExplicitUserAction = false)
+
+    // Pausing when not actually playing should never log an event since it's an invalid state.
+    assertThat(fakeAnalyticsEventLogger.noEventsPresent()).isTrue()
+  }
 
   private fun arrangeMediaPlayer(contentId: String? = null, languageCode: String = "en") {
     audioPlayerController.initializeMediaPlayer().observeForever(mockAudioPlayerObserver)
diff --git a/domain/src/test/java/org/oppia/android/domain/hintsandsolution/HelpIndexExtensionsTest.kt b/domain/src/test/java/org/oppia/android/domain/hintsandsolution/HelpIndexExtensionsTest.kt
index 76e10344496..40534449c0a 100644
--- a/domain/src/test/java/org/oppia/android/domain/hintsandsolution/HelpIndexExtensionsTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/hintsandsolution/HelpIndexExtensionsTest.kt
@@ -6,6 +6,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.oppia.android.app.model.HelpIndex
 import org.oppia.android.app.model.Hint
+import org.oppia.android.app.model.SubtitledHtml
 import org.robolectric.annotation.Config
 import org.robolectric.annotation.LooperMode
 
@@ -15,13 +16,16 @@ import org.robolectric.annotation.LooperMode
 @LooperMode(LooperMode.Mode.PAUSED)
 @Config(manifest = Config.NONE)
 class HelpIndexExtensionsTest {
-  @Suppress("PrivatePropertyName")
-  private val HINT_LIST_OF_SIZE_2 = listOf(Hint.getDefaultInstance(), Hint.getDefaultInstance())
 
-  @Suppress("PrivatePropertyName")
-  private val HINT_LIST_OF_SIZE_3 = listOf(
-    Hint.getDefaultInstance(), Hint.getDefaultInstance(), Hint.getDefaultInstance()
-  )
+  private companion object {
+    private val HINT_0 = createHint(text = "First hint")
+    private val HINT_1 = createHint(text = "Second hint")
+    private val HINT_2 = createHint(text = "Third hint")
+
+    private val HINT_LIST_OF_SIZE_1 = listOf(HINT_0)
+    private val HINT_LIST_OF_SIZE_2 = HINT_LIST_OF_SIZE_1 + HINT_1
+    private val HINT_LIST_OF_SIZE_3 = HINT_LIST_OF_SIZE_2 + HINT_2
+  }
 
   @Test
   fun testIsHintRevealed_defaultHelpIndex_returnsFalse() {
@@ -225,45 +229,385 @@ class HelpIndexExtensionsTest {
     assertThat(hintIsRevealed).isFalse()
   }
 
-  // TODO: Add tests.
-  // - testDropLastUnavailable_defaultHelpIndex_emptyList_returnsEmptyList
-  // - testDropLastUnavailable_defaultHelpIndex_nonEmptyList_returnsEmptyList
-  // - testDropLastUnavailable_availableHintIndex0_emptyList_returnsEmptyList
-  // - testDropLastUnavailable_availableHintIndex0_singletonList_returnsSingletonList
-  // - testDropLastUnavailable_availableHintIndex0_twoHintsList_returnsSingletonList
-  // - testDropLastUnavailable_availableHintIndex1_emptyList_returnsEmptyList
-  // - testDropLastUnavailable_availableHintIndex1_singletonList_returnsSingletonList
-  // - testDropLastUnavailable_availableHintIndex1_twoHintsList_returnsTwoItemList
-  // - testDropLastUnavailable_availableHintIndex1_threeHintsList_returnsTwoItemList
-  // - testDropLastUnavailable_lastRevealedHintIndex0_emptyList_returnsEmptyList
-  // - testDropLastUnavailable_lastRevealedHintIndex0_singletonList_returnsSingletonList
-  // - testDropLastUnavailable_lastRevealedHintIndex0_twoHintsList_returnsSingletonList
-  // - testDropLastUnavailable_lastRevealedHintIndex1_emptyList_returnsEmptyList
-  // - testDropLastUnavailable_lastRevealedHintIndex1_singletonList_returnsSingletonList
-  // - testDropLastUnavailable_lastRevealedHintIndex1_twoHintsList_returnsTwoItemList
-  // - testDropLastUnavailable_lastRevealedHintIndex1_threeHintsList_returnsTwoItemList
-  // - testDropLastUnavailable_showSolution_emptyList_returnsEmptyList
-  // - testDropLastUnavailable_showSolution_singletonList_returnsSingletonList
-  // - testDropLastUnavailable_showSolution_twoHintsList_returnsTwoHintsList
-  // - testDropLastUnavailable_showSolution_emptyList_returnsEmptyList
-  // - testDropLastUnavailable_showSolution_singletonList_returnsSingletonList
-  // - testDropLastUnavailable_showSolution_twoHintsList_returnsTwoItemList
-  // - testDropLastUnavailable_showSolution_threeHintsList_returnsThreeItemList
-  // - testDropLastUnavailable_everythingRevealed_emptyList_returnsEmptyList
-  // - testDropLastUnavailable_everythingRevealed_singletonList_returnsSingletonList
-  // - testDropLastUnavailable_everythingRevealed_twoHintsList_returnsTwoHintsList
-  // - testDropLastUnavailable_everythingRevealed_emptyList_returnsEmptyList
-  // - testDropLastUnavailable_everythingRevealed_singletonList_returnsSingletonList
-  // - testDropLastUnavailable_everythingRevealed_twoHintsList_returnsTwoItemList
-  // - testDropLastUnavailable_everythingRevealed_threeHintsList_returnsThreeItemList
-  //
-  // - testIsSolutionAvailable_defaultHelpIndex_returnsFalse
-  // - testIsSolutionAvailable_availableHint0_returnsFalse
-  // - testIsSolutionAvailable_availableHint1_returnsFalse
-  // - testIsSolutionAvailable_viewedHint0_returnsFalse
-  // - testIsSolutionAvailable_viewedHint1_returnsFalse
-  // - testIsSolutionAvailable_showSolution_returnsTrue
-  // - testIsSolutionAvailable_everythingIsRevealed_returnsTrue
+  @Test
+  fun testDropLastUnavailable_defaultHelpIndex_emptyList_returnsEmptyList() {
+    val helpIndex = HelpIndex.getDefaultInstance()
+
+    val hintList = helpIndex.dropLastUnavailable(hintList = listOf())
+
+    assertThat(hintList).isEmpty()
+  }
+
+  @Test
+  fun testDropLastUnavailable_defaultHelpIndex_nonEmptyList_returnsEmptyList() {
+    val helpIndex = HelpIndex.getDefaultInstance()
+
+    val hintList = helpIndex.dropLastUnavailable(hintList = HINT_LIST_OF_SIZE_1)
+
+    assertThat(hintList).isEmpty()
+  }
+
+  @Test
+  fun testDropLastUnavailable_availableHintIndex0_emptyList_returnsEmptyList() {
+    val helpIndex = HelpIndex.newBuilder().apply {
+      nextAvailableHintIndex = 0
+    }.build()
+
+    val hintList = helpIndex.dropLastUnavailable(hintList = listOf())
+
+    assertThat(hintList).isEmpty()
+  }
+
+  @Test
+  fun testDropLastUnavailable_availableHintIndex0_singletonList_returnsSingletonList() {
+    val helpIndex = HelpIndex.newBuilder().apply {
+      nextAvailableHintIndex = 0
+    }.build()
+
+    val hintList = helpIndex.dropLastUnavailable(hintList = HINT_LIST_OF_SIZE_1)
+
+    assertThat(hintList).hasSize(1)
+    assertThat(hintList[0]).isEqualTo(HINT_0)
+  }
+
+  @Test
+  fun testDropLastUnavailable_availableHintIndex0_twoHintsList_returnsSingletonList() {
+    val helpIndex = HelpIndex.newBuilder().apply {
+      nextAvailableHintIndex = 0
+    }.build()
+
+    val hintList = helpIndex.dropLastUnavailable(hintList = HINT_LIST_OF_SIZE_2)
+
+    // Only the first hint is available to be seen.
+    assertThat(hintList).hasSize(1)
+    assertThat(hintList[0]).isEqualTo(HINT_0)
+  }
+
+  @Test
+  fun testDropLastUnavailable_availableHintIndex1_emptyList_returnsEmptyList() {
+    val helpIndex = HelpIndex.newBuilder().apply {
+      nextAvailableHintIndex = 1
+    }.build()
+
+    val hintList = helpIndex.dropLastUnavailable(hintList = listOf())
+
+    assertThat(hintList).isEmpty()
+  }
+
+  @Test
+  fun testDropLastUnavailable_availableHintIndex1_singletonList_returnsSingletonList() {
+    val helpIndex = HelpIndex.newBuilder().apply {
+      nextAvailableHintIndex = 1
+    }.build()
+
+    val hintList = helpIndex.dropLastUnavailable(hintList = HINT_LIST_OF_SIZE_1)
+
+    assertThat(hintList).hasSize(1)
+    assertThat(hintList[0]).isEqualTo(HINT_0)
+  }
+
+  @Test
+  fun testDropLastUnavailable_availableHintIndex1_twoHintsList_returnsTwoItemList() {
+    val helpIndex = HelpIndex.newBuilder().apply {
+      nextAvailableHintIndex = 1
+    }.build()
+
+    val hintList = helpIndex.dropLastUnavailable(hintList = HINT_LIST_OF_SIZE_2)
+
+    assertThat(hintList).hasSize(2)
+    assertThat(hintList[0]).isEqualTo(HINT_0)
+    assertThat(hintList[1]).isEqualTo(HINT_1)
+  }
+
+  @Test
+  fun testDropLastUnavailable_availableHintIndex1_threeHintsList_returnsTwoItemList() {
+    val helpIndex = HelpIndex.newBuilder().apply {
+      nextAvailableHintIndex = 1
+    }.build()
+
+    val hintList = helpIndex.dropLastUnavailable(hintList = HINT_LIST_OF_SIZE_3)
+
+    // Only the first two hints are available.
+    assertThat(hintList).hasSize(2)
+    assertThat(hintList[0]).isEqualTo(HINT_0)
+    assertThat(hintList[1]).isEqualTo(HINT_1)
+  }
+
+  @Test
+  fun testDropLastUnavailable_lastRevealedHintIndex0_emptyList_returnsEmptyList() {
+    val helpIndex = HelpIndex.newBuilder().apply {
+      latestRevealedHintIndex = 0
+    }.build()
+
+    val hintList = helpIndex.dropLastUnavailable(hintList = listOf())
+
+    assertThat(hintList).isEmpty()
+  }
+
+  @Test
+  fun testDropLastUnavailable_lastRevealedHintIndex0_singletonList_returnsSingletonList() {
+    val helpIndex = HelpIndex.newBuilder().apply {
+      latestRevealedHintIndex = 0
+    }.build()
+
+    val hintList = helpIndex.dropLastUnavailable(hintList = HINT_LIST_OF_SIZE_1)
+
+    assertThat(hintList).hasSize(1)
+    assertThat(hintList[0]).isEqualTo(HINT_0)
+  }
+
+  @Test
+  fun testDropLastUnavailable_lastRevealedHintIndex0_twoHintsList_returnsSingletonList() {
+    val helpIndex = HelpIndex.newBuilder().apply {
+      latestRevealedHintIndex = 0
+    }.build()
+
+    val hintList = helpIndex.dropLastUnavailable(hintList = HINT_LIST_OF_SIZE_2)
+
+    // Only the first hint is available.
+    assertThat(hintList).hasSize(1)
+    assertThat(hintList[0]).isEqualTo(HINT_0)
+  }
+
+  @Test
+  fun testDropLastUnavailable_lastRevealedHintIndex1_emptyList_returnsEmptyList() {
+    val helpIndex = HelpIndex.newBuilder().apply {
+      latestRevealedHintIndex = 1
+    }.build()
+
+    val hintList = helpIndex.dropLastUnavailable(hintList = listOf())
+
+    assertThat(hintList).isEmpty()
+  }
+
+  @Test
+  fun testDropLastUnavailable_lastRevealedHintIndex1_singletonList_returnsSingletonList() {
+    val helpIndex = HelpIndex.newBuilder().apply {
+      latestRevealedHintIndex = 1
+    }.build()
+
+    val hintList = helpIndex.dropLastUnavailable(hintList = HINT_LIST_OF_SIZE_1)
+
+    assertThat(hintList).hasSize(1)
+    assertThat(hintList[0]).isEqualTo(HINT_0)
+  }
+
+  @Test
+  fun testDropLastUnavailable_lastRevealedHintIndex1_twoHintsList_returnsTwoItemList() {
+    val helpIndex = HelpIndex.newBuilder().apply {
+      latestRevealedHintIndex = 1
+    }.build()
+
+    val hintList = helpIndex.dropLastUnavailable(hintList = HINT_LIST_OF_SIZE_2)
+
+    assertThat(hintList).hasSize(2)
+    assertThat(hintList[0]).isEqualTo(HINT_0)
+    assertThat(hintList[1]).isEqualTo(HINT_1)
+  }
+
+  @Test
+  fun testDropLastUnavailable_lastRevealedHintIndex1_threeHintsList_returnsTwoItemList() {
+    val helpIndex = HelpIndex.newBuilder().apply {
+      latestRevealedHintIndex = 1
+    }.build()
+
+    val hintList = helpIndex.dropLastUnavailable(hintList = HINT_LIST_OF_SIZE_3)
+
+    // Only the first two hints are available.
+    assertThat(hintList).hasSize(2)
+    assertThat(hintList[0]).isEqualTo(HINT_0)
+    assertThat(hintList[1]).isEqualTo(HINT_1)
+  }
+
+  @Test
+  fun testDropLastUnavailable_showSolution_emptyList_returnsEmptyList() {
+    val helpIndex = HelpIndex.newBuilder().apply {
+      showSolution = true
+    }.build()
+
+    val hintList = helpIndex.dropLastUnavailable(hintList = listOf())
+
+    // There are no hints to show.
+    assertThat(hintList).isEmpty()
+  }
+
+  @Test
+  fun testDropLastUnavailable_showSolution_singletonList_returnsSingletonList() {
+    val helpIndex = HelpIndex.newBuilder().apply {
+      showSolution = true
+    }.build()
+
+    val hintList = helpIndex.dropLastUnavailable(hintList = HINT_LIST_OF_SIZE_1)
+
+    // The only hint is available.
+    assertThat(hintList).hasSize(1)
+    assertThat(hintList[0]).isEqualTo(HINT_0)
+  }
+
+  @Test
+  fun testDropLastUnavailable_showSolution_twoHintsList_returnsTwoHintsList() {
+    val helpIndex = HelpIndex.newBuilder().apply {
+      showSolution = true
+    }.build()
+
+    val hintList = helpIndex.dropLastUnavailable(hintList = HINT_LIST_OF_SIZE_2)
+
+    // All hints are available.
+    assertThat(hintList).hasSize(2)
+    assertThat(hintList[0]).isEqualTo(HINT_0)
+    assertThat(hintList[1]).isEqualTo(HINT_1)
+  }
+
+  @Test
+  fun testDropLastUnavailable_showSolution_threeHintsList_returnsThreeHintsList() {
+    val helpIndex = HelpIndex.newBuilder().apply {
+      showSolution = true
+    }.build()
+
+    val hintList = helpIndex.dropLastUnavailable(hintList = HINT_LIST_OF_SIZE_3)
+
+    // All hints are available.
+    assertThat(hintList).hasSize(3)
+    assertThat(hintList[0]).isEqualTo(HINT_0)
+    assertThat(hintList[1]).isEqualTo(HINT_1)
+    assertThat(hintList[2]).isEqualTo(HINT_2)
+  }
+
+  @Test
+  fun testDropLastUnavailable_everythingRevealed_emptyList_returnsEmptyList() {
+    val helpIndex = HelpIndex.newBuilder().apply {
+      everythingRevealed = true
+    }.build()
+
+    val hintList = helpIndex.dropLastUnavailable(hintList = listOf())
+
+    // There are no hints to show.
+    assertThat(hintList).isEmpty()
+  }
+
+  @Test
+  fun testDropLastUnavailable_everythingRevealed_singletonList_returnsSingletonList() {
+    val helpIndex = HelpIndex.newBuilder().apply {
+      everythingRevealed = true
+    }.build()
+
+    val hintList = helpIndex.dropLastUnavailable(hintList = HINT_LIST_OF_SIZE_1)
+
+    // The only hint is available.
+    assertThat(hintList).hasSize(1)
+    assertThat(hintList[0]).isEqualTo(HINT_0)
+  }
+
+  @Test
+  fun testDropLastUnavailable_everythingRevealed_twoHintsList_returnsTwoHintsList() {
+    val helpIndex = HelpIndex.newBuilder().apply {
+      everythingRevealed = true
+    }.build()
+
+    val hintList = helpIndex.dropLastUnavailable(hintList = HINT_LIST_OF_SIZE_2)
+
+    // All hints are available.
+    assertThat(hintList).hasSize(2)
+    assertThat(hintList[0]).isEqualTo(HINT_0)
+    assertThat(hintList[1]).isEqualTo(HINT_1)
+  }
+
+  @Test
+  fun testDropLastUnavailable_everythingRevealed_threeHintsList_returnsThreeHintsList() {
+    val helpIndex = HelpIndex.newBuilder().apply {
+      everythingRevealed = true
+    }.build()
+
+    val hintList = helpIndex.dropLastUnavailable(hintList = HINT_LIST_OF_SIZE_3)
+
+    // All hints are available.
+    assertThat(hintList).hasSize(3)
+    assertThat(hintList[0]).isEqualTo(HINT_0)
+    assertThat(hintList[1]).isEqualTo(HINT_1)
+    assertThat(hintList[2]).isEqualTo(HINT_2)
+  }
+
+  @Test
+  fun testIsSolutionAvailable_defaultHelpIndex_returnsFalse() {
+    val helpIndex = HelpIndex.getDefaultInstance()
+
+    val solutionIsAvailable = helpIndex.isSolutionAvailable()
+
+    // By default, the solution is not available to be revealed.
+    assertThat(solutionIsAvailable).isFalse()
+  }
+
+  @Test
+  fun testIsSolutionAvailable_availableHint0_returnsFalse() {
+    val helpIndex = HelpIndex.newBuilder().apply {
+      nextAvailableHintIndex = 0
+    }.build()
+
+    val solutionIsAvailable = helpIndex.isSolutionAvailable()
+
+    // If there's an available hint to be shown, the solution is not yet available to reveal.
+    assertThat(solutionIsAvailable).isFalse()
+  }
+
+  @Test
+  fun testIsSolutionAvailable_availableHint1_returnsFalse() {
+    val helpIndex = HelpIndex.newBuilder().apply {
+      nextAvailableHintIndex = 1
+    }.build()
+
+    val solutionIsAvailable = helpIndex.isSolutionAvailable()
+
+    // If there's an available hint to be shown, the solution is not yet available to reveal.
+    assertThat(solutionIsAvailable).isFalse()
+  }
+
+  @Test
+  fun testIsSolutionAvailable_viewedHint0_returnsFalse() {
+    val helpIndex = HelpIndex.newBuilder().apply {
+      latestRevealedHintIndex = 0
+    }.build()
+
+    val solutionIsAvailable = helpIndex.isSolutionAvailable()
+
+    // If a hint has been viewed and there are yet more hints, the solution isn't yet available.
+    assertThat(solutionIsAvailable).isFalse()
+  }
+
+  @Test
+  fun testIsSolutionAvailable_viewedHint1_returnsFalse() {
+    val helpIndex = HelpIndex.newBuilder().apply {
+      latestRevealedHintIndex = 1
+    }.build()
+
+    val solutionIsAvailable = helpIndex.isSolutionAvailable()
+
+    // If a hint has been viewed and there are yet more hints, the solution isn't yet available.
+    assertThat(solutionIsAvailable).isFalse()
+  }
+
+  @Test
+  fun testIsSolutionAvailable_showSolution_returnsTrue() {
+    val helpIndex = HelpIndex.newBuilder().apply {
+      showSolution = true
+    }.build()
+
+    val solutionIsAvailable = helpIndex.isSolutionAvailable()
+
+    // If the solution can be shown, it's available.
+    assertThat(solutionIsAvailable).isTrue()
+  }
+
+  @Test
+  fun testIsSolutionAvailable_everythingIsRevealed_returnsTrue() {
+    val helpIndex = HelpIndex.newBuilder().apply {
+      everythingRevealed = true
+    }.build()
+
+    val solutionIsAvailable = helpIndex.isSolutionAvailable()
+
+    // If the solution has been revealed already, it's still available to be viewed.
+    assertThat(solutionIsAvailable).isTrue()
+  }
 
   @Test
   fun testIsSolutionRevealed_defaultHelpIndex_returnsFalse() {
@@ -349,3 +693,11 @@ class HelpIndexExtensionsTest {
     assertThat(solutionIsRevealed).isTrue()
   }
 }
+
+private fun createHint(text: String): Hint {
+  return Hint.newBuilder().apply {
+    hintContent = SubtitledHtml.newBuilder().apply {
+      html = text
+    }.build()
+  }.build()
+}
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 59d3c4550b6..09a9cf25c8c 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
@@ -926,12 +926,86 @@ class LearnerAnalyticsLoggerTest {
     assertThat(eventLog).hasPlayVoiceOverContextThat().hasContentIdThat().isEmpty()
   }
 
-  // TODO: Add tests.
-  // - testStateAnalyticsLogger_logPlayVoiceOver_nullLanguageCode_logsStateEventWithoutLanguageCode
-  // - testStateAnalyticsLogger_logPauseVoiceOver_logsStateEventWithContentIdAndLanguageCode
-  // - testStateAnalyticsLogger_logPauseVoiceOver_diffContentId_logsStateEventWithContentIdAndLang
-  // - testStateAnalyticsLogger_logPauseVoiceOver_nullContentId_logsStateEventWithoutContentId
-  // - testStateAnalyticsLogger_logPauseVoiceOver_nullLanguageCode_logsStateEventWithoutLanguageCode
+  @Test
+  fun testStateAnalyticsLogger_logPlayVoiceOver_nullLanguageCode_logsStateEventWithNoLangCode() {
+    val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
+    val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
+    val stateLogger = expLogger.startCard(exploration5.getStateByName(TEST_EXP_5_STATE_THREE_NAME))
+
+    stateLogger.logPlayVoiceOver(contentId = "content_id_2", languageCode = null)
+
+    val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
+    assertThat(eventLog).isEssentialPriority()
+    assertThat(eventLog).hasPlayVoiceOverContextThat().hasLanguageCodeThat().isEmpty()
+  }
+
+  @Test
+  fun testStateAnalyticsLogger_logPauseVoiceOver_logsStateEventWithContentIdAndLanguageCode() {
+    val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
+    val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
+    val stateLogger = expLogger.startCard(exploration5.getStateByName(TEST_EXP_5_STATE_THREE_NAME))
+
+    stateLogger.logPauseVoiceOver(contentId = "test_content_id_1", languageCode = "en")
+
+    val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
+    assertThat(eventLog).isEssentialPriority()
+    assertThat(eventLog).hasPauseVoiceOverContextThat {
+      hasExplorationDetailsThat {
+        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)
+        }
+      }
+      hasContentIdThat().isEqualTo("test_content_id_1")
+      hasLanguageCodeThat().isEqualTo("en")
+    }
+  }
+
+  @Test
+  fun testStateAnalyticsLogger_logPauseVoiceOver_diffContentIdAndLang_logsEventNewContentAndLang() {
+    val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
+    val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
+    val stateLogger = expLogger.startCard(exploration5.getStateByName(TEST_EXP_5_STATE_THREE_NAME))
+
+    stateLogger.logPauseVoiceOver(contentId = "content_id_2", languageCode = "sw")
+
+    val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
+    assertThat(eventLog).isEssentialPriority()
+    assertThat(eventLog).hasPauseVoiceOverContextThat().hasContentIdThat().isEqualTo("content_id_2")
+    assertThat(eventLog).hasPauseVoiceOverContextThat().hasLanguageCodeThat().isEqualTo("sw")
+  }
+
+  @Test
+  fun testStateAnalyticsLogger_logPauseVoiceOver_nullContentId_logsStateEventWithoutContentId() {
+    val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
+    val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
+    val stateLogger = expLogger.startCard(exploration5.getStateByName(TEST_EXP_5_STATE_THREE_NAME))
+
+    stateLogger.logPauseVoiceOver(contentId = null, languageCode = "en")
+
+    val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
+    assertThat(eventLog).isEssentialPriority()
+    assertThat(eventLog).hasPauseVoiceOverContextThat().hasContentIdThat().isEmpty()
+  }
+
+  @Test
+  fun testStateAnalyticsLogger_logPauseVoiceOver_nullLanguageCode_logsStateEventWithNoLangCode() {
+    val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
+    val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
+    val stateLogger = expLogger.startCard(exploration5.getStateByName(TEST_EXP_5_STATE_THREE_NAME))
+
+    stateLogger.logPauseVoiceOver(contentId = "content_id_2", languageCode = null)
+
+    val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
+    assertThat(eventLog).isEssentialPriority()
+    assertThat(eventLog).hasPauseVoiceOverContextThat().hasLanguageCodeThat().isEmpty()
+  }
 
   @Test
   @RunParameterized(
@@ -1409,9 +1483,48 @@ class LearnerAnalyticsLoggerTest {
     assertThat(log.type).isEqualTo(Log.ERROR)
   }
 
-  // TODO: Add tests.
-  // - testStateAnalyticsLogger_logPauseVoiceOver_missingOneId_logsEventWithMissingId (parameterized)
-  // - testStateAnalyticsLogger_logPauseVoiceOver_noInstallOrLearnerIds_logsEventAndConsoleErrors
+  @Test
+  @RunParameterized(
+    Iteration("no_install_id", "lid=learn", "iid=null", "elid=learn", "eid="),
+    Iteration("no_learner_id", "lid=null", "iid=install", "elid=", "eid=install")
+  )
+  fun testStateAnalyticsLogger_logPauseVoiceOver_missingOneId_logsEventWithMissingId() {
+    val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
+    val expLogger =
+      learnerAnalyticsLogger.beginExploration(
+        exploration5, learnerId = learnerIdParameter, installationId = installIdParameter
+      )
+    val stateLogger = expLogger.startCard(exploration5.getStateByName(exploration5.initStateName))
+
+    stateLogger.logPauseVoiceOver(contentId = "test_content_id_1", languageCode = "en")
+
+    val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
+    assertThat(eventLog).hasPauseVoiceOverContextThat {
+      hasExplorationDetailsThat {
+        hasLearnerDetailsThat {
+          hasLearnerIdThat().isEqualTo(expectedLearnerIdParameter)
+          hasInstallationIdThat().isEqualTo(expectedInstallIdParameter)
+        }
+      }
+    }
+  }
+
+  @Test
+  fun testStateAnalyticsLogger_logPauseVoiceOver_noInstallOrLearnerIds_logsEventAndConsoleErrors() {
+    val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
+    val expLogger =
+      learnerAnalyticsLogger.beginExploration(exploration5, learnerId = null, installationId = null)
+    val stateLogger = expLogger.startCard(exploration5.getStateByName(exploration5.initStateName))
+
+    stateLogger.logPauseVoiceOver(contentId = "test_content_id_1", languageCode = "en")
+
+    // See testExpLogger_logExitExploration_noInstallOrLearnerIds_logsEventAndConsoleErrors.
+    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
   fun testStateAnalyticsLogger_logReachInvestedEngagement_logsStateEventWithStateName() {
diff --git a/scripts/assets/kdoc_validity_exemptions.textproto b/scripts/assets/kdoc_validity_exemptions.textproto
index bcde45b622b..24f10c166ef 100644
--- a/scripts/assets/kdoc_validity_exemptions.textproto
+++ b/scripts/assets/kdoc_validity_exemptions.textproto
@@ -34,7 +34,6 @@ exempted_file_path: "app/src/main/java/org/oppia/android/app/devoptions/markchap
 exempted_file_path: "app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedActivityPresenter.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedFragmentPresenter.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/MarkChaptersCompletedViewModel.kt"
-exempted_file_path: "app/src/main/java/org/oppia/android/app/devoptions/markchapterscompleted/testing/MarkChaptersCompletedTestActivity.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/devoptions/markstoriescompleted/MarkStoriesCompletedActivity.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/devoptions/markstoriescompleted/MarkStoriesCompletedActivityPresenter.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/devoptions/markstoriescompleted/MarkStoriesCompletedFragment.kt"
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 eaa5931e8ab..ec054d028b2 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
@@ -31,6 +31,7 @@ import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.OPEN_QUE
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.OPEN_REVISION_CARD
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.OPEN_REVISION_TAB
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.OPEN_STORY_ACTIVITY
+import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.PAUSE_VOICE_OVER_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.PLAY_VOICE_OVER_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.REACH_INVESTED_ENGAGEMENT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.RESUME_EXPLORATION_CONTEXT
@@ -542,6 +543,32 @@ class EventLogSubject private constructor(
     hasPlayVoiceOverContextThat().block()
   }
 
+  /**
+   * Verifies that the [EventLog] under test has a context corresponding to
+   * [PAUSE_VOICE_OVER_CONTEXT] (per [EventLog.Context.getActivityContextCase]).
+   */
+  fun hasPauseVoiceOverContext() {
+    assertThat(actual.context.activityContextCase).isEqualTo(PAUSE_VOICE_OVER_CONTEXT)
+  }
+
+  /**
+   * Verifies the [EventLog]'s context per [hasPauseVoiceOverContext] and returns a
+   * [PlayVoiceOverContextSubject] to test the corresponding context.
+   */
+  fun hasPauseVoiceOverContextThat(): PlayVoiceOverContextSubject {
+    hasPauseVoiceOverContext()
+    return PlayVoiceOverContextSubject.assertThat(actual.context.pauseVoiceOverContext)
+  }
+
+  /**
+   * Verifies the [EventLog]'s context and executes [block] in the same way as
+   * [hasOpenExplorationActivityContextThat] except for the conditions of, and subject returned by,
+   * [hasPauseVoiceOverContextThat].
+   */
+  fun hasPauseVoiceOverContextThat(block: PlayVoiceOverContextSubject.() -> Unit) {
+    hasPauseVoiceOverContextThat().block()
+  }
+
   /**
    * Verifies that the [EventLog] under test has a context corresponding to
    * [APP_IN_BACKGROUND_CONTEXT] (per [EventLog.Context.getActivityContextCase]).
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 04897cedf45..5e5e05d85dd 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
@@ -40,6 +40,7 @@ import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.OPEN_QUE
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.OPEN_REVISION_CARD
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.OPEN_REVISION_TAB
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.OPEN_STORY_ACTIVITY
+import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.PAUSE_VOICE_OVER_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.PLAY_VOICE_OVER_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.REACH_INVESTED_ENGAGEMENT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.RESUME_EXPLORATION_CONTEXT
@@ -383,7 +384,7 @@ class EventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_openExpActivityEvent_studyOn_fillsOnlyNonSensitiveFieldsAndRetsName() {
+  fun testFillEventBundle_openExpActivityEvent_studyOn_fillsAllFieldsAndReturnsName() {
     setUpTestApplicationComponentWithLearnerAnalyticsStudy()
     val bundle = Bundle()
 
@@ -752,7 +753,7 @@ class EventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_startCardContextEvent_studyOn_fillsOnlyNonSensitiveFieldsAndRetsName() {
+  fun testFillEventBundle_startCardContextEvent_studyOn_fillsAllFieldsAndReturnsName() {
     setUpTestApplicationComponentWithLearnerAnalyticsStudy()
     val bundle = Bundle()
 
@@ -804,7 +805,7 @@ class EventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_endCardContextEvent_studyOn_fillsOnlyNonSensitiveFieldsAndRetsName() {
+  fun testFillEventBundle_endCardContextEvent_studyOn_fillsAllFieldsAndReturnsName() {
     setUpTestApplicationComponentWithLearnerAnalyticsStudy()
     val bundle = Bundle()
 
@@ -856,7 +857,7 @@ class EventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_hintOfferedEvent_studyOn_fillsOnlyNonSensitiveFieldsAndRetsName() {
+  fun testFillEventBundle_hintOfferedEvent_studyOn_fillsAllFieldsAndReturnsName() {
     setUpTestApplicationComponentWithLearnerAnalyticsStudy()
     val bundle = Bundle()
 
@@ -908,7 +909,7 @@ class EventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_accessHintContextEvent_studyOn_fillsOnlyNonSensitiveFieldsAndRetsName() {
+  fun testFillEventBundle_accessHintContextEvent_studyOn_fillsAllFieldsAndReturnsName() {
     setUpTestApplicationComponentWithLearnerAnalyticsStudy()
     val bundle = Bundle()
 
@@ -959,7 +960,7 @@ class EventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_solutionOfferedEvent_studyOn_fillsOnlyNonSensitiveFieldsAndRetsName() {
+  fun testFillEventBundle_solutionOfferedEvent_studyOn_fillsAllFieldsAndReturnsName() {
     setUpTestApplicationComponentWithLearnerAnalyticsStudy()
     val bundle = Bundle()
 
@@ -1009,7 +1010,7 @@ class EventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_accessSolutionEvent_studyOn_fillsOnlyNonSensitiveFieldsAndRetsName() {
+  fun testFillEventBundle_accessSolutionEvent_studyOn_fillsAllFieldsAndReturnsName() {
     setUpTestApplicationComponentWithLearnerAnalyticsStudy()
     val bundle = Bundle()
 
@@ -1061,7 +1062,7 @@ class EventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_submitAnswerEvent_studyOn_fillsOnlyNonSensitiveFieldsAndRetsName() {
+  fun testFillEventBundle_submitAnswerEvent_studyOn_fillsAllFieldsAndReturnsName() {
     setUpTestApplicationComponentWithLearnerAnalyticsStudy()
     val bundle = Bundle()
 
@@ -1115,7 +1116,7 @@ class EventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_playVoiceOverEvent_studyOn_fillsOnlyNonSensitiveFieldsAndRetsName() {
+  fun testFillEventBundle_playVoiceOverEvent_studyOn_fillsAllFieldsAndReturnsName() {
     setUpTestApplicationComponentWithLearnerAnalyticsStudy()
     val bundle = Bundle()
 
@@ -1142,10 +1143,59 @@ class EventBundleCreatorTest {
     assertThat(bundle).string("ed_ld_install_id").isEqualTo(TEST_INSTALLATION_ID)
   }
 
-  // TODO: Add tests.
-  // - Update all "studyOn" cases to match the new one below.
-  // - testFillEventBundle_pauseVoiceOverEvent_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName
-  // - testFillEventBundle_pauseVoiceOverEvent_studyOn_fillsAllFieldsAndReturnsName
+  @Test
+  fun testFillEventBundle_pauseVoiceOverEvent_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName() {
+    setUpTestApplicationComponentWithoutLearnerAnalyticsStudy()
+    val bundle = Bundle()
+
+    val eventLog = createEventLog(context = createPauseVoiceOverContext())
+
+    val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
+    assertThat(typeName).isEqualTo("click_pause_voiceover_button")
+    assertThat(bundle).hasSize(14)
+    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_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)
+    assertThat(bundle).string("ed_session_id").isEqualTo(TEST_LEARNER_SESSION_ID)
+    assertThat(bundle).string("ed_exploration_version").isEqualTo(TEST_EXPLORATION_VERSION_STR)
+    assertThat(bundle).string("ed_state_name").isEqualTo(TEST_STATE_NAME)
+    assertThat(bundle).string("content_id").isEqualTo(TEST_CONTENT_ID)
+    assertThat(bundle).string("language_code").isEqualTo(TEST_LANGUAGE_CODE)
+  }
+
+  @Test
+  fun testFillEventBundle_pauseVoiceOverEvent_studyOn_fillsAllFieldsAndReturnsName() {
+    setUpTestApplicationComponentWithLearnerAnalyticsStudy()
+    val bundle = Bundle()
+
+    val eventLog = createEventLog(context = createPauseVoiceOverContext())
+
+    val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
+    assertThat(typeName).isEqualTo("click_pause_voiceover_button")
+    assertThat(bundle).hasSize(16)
+    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_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)
+    assertThat(bundle).string("ed_session_id").isEqualTo(TEST_LEARNER_SESSION_ID)
+    assertThat(bundle).string("ed_exploration_version").isEqualTo(TEST_EXPLORATION_VERSION_STR)
+    assertThat(bundle).string("ed_state_name").isEqualTo(TEST_STATE_NAME)
+    assertThat(bundle).string("content_id").isEqualTo(TEST_CONTENT_ID)
+    assertThat(bundle).string("language_code").isEqualTo(TEST_LANGUAGE_CODE)
+    assertThat(bundle).string("ed_ld_learner_id").isEqualTo(TEST_LEARNER_ID)
+    assertThat(bundle).string("ed_ld_install_id").isEqualTo(TEST_INSTALLATION_ID)
+  }
 
   @Test
   fun testFillEventBundle_appInBackgroundEvent_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName() {
@@ -1166,7 +1216,7 @@ class EventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_appInBackgroundEvent_studyOn_fillsOnlyNonSensitiveFieldsAndRetsName() {
+  fun testFillEventBundle_appInBackgroundEvent_studyOn_fillsAllFieldsAndReturnsName() {
     setUpTestApplicationComponentWithLearnerAnalyticsStudy()
     val bundle = Bundle()
 
@@ -1204,7 +1254,7 @@ class EventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_appInForegroundEvent_studyOn_fillsOnlyNonSensitiveFieldsAndRetsName() {
+  fun testFillEventBundle_appInForegroundEvent_studyOn_fillsAllFieldsAndReturnsName() {
     setUpTestApplicationComponentWithLearnerAnalyticsStudy()
     val bundle = Bundle()
 
@@ -1248,7 +1298,7 @@ class EventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_exitExplorationEvent_studyOn_fillsOnlyNonSensitiveFieldsAndRetsName() {
+  fun testFillEventBundle_exitExplorationEvent_studyOn_fillsAllFieldsAndReturnsName() {
     setUpTestApplicationComponentWithLearnerAnalyticsStudy()
     val bundle = Bundle()
 
@@ -1298,7 +1348,7 @@ class EventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_finishExplorationEvent_studyOn_fillsOnlyNonSensitiveFieldsAndRetsName() {
+  fun testFillEventBundle_finishExplorationEvent_studyOn_fillsAllFieldsAndReturnsName() {
     setUpTestApplicationComponentWithLearnerAnalyticsStudy()
     val bundle = Bundle()
 
@@ -1342,7 +1392,7 @@ class EventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_resumeExplorationEvent_studyOn_fillsOnlyNonSensitiveFieldsAndRetsName() {
+  fun testFillEventBundle_resumeExplorationEvent_studyOn_fillsAllFieldsAndReturnsName() {
     setUpTestApplicationComponentWithLearnerAnalyticsStudy()
     val bundle = Bundle()
 
@@ -1380,7 +1430,7 @@ class EventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_startOverExpEvent_studyOn_fillsOnlyNonSensitiveFieldsAndRetsName() {
+  fun testFillEventBundle_startOverExpEvent_studyOn_fillsAllFieldsAndReturnsName() {
     setUpTestApplicationComponentWithLearnerAnalyticsStudy()
     val bundle = Bundle()
 
@@ -1418,7 +1468,7 @@ class EventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_deleteProfileEvent_studyOn_fillsOnlyNonSensitiveFieldsAndRetsName() {
+  fun testFillEventBundle_deleteProfileEvent_studyOn_fillsAllFieldsAndReturnsName() {
     setUpTestApplicationComponentWithLearnerAnalyticsStudy()
     val bundle = Bundle()
 
@@ -1542,7 +1592,7 @@ class EventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_failedEventInstallId_studyOn_fillsOnlyNonSensitiveFieldsAndRetsName() {
+  fun testFillEventBundle_failedEventInstallId_studyOn_fillsAllFieldsAndReturnsName() {
     setUpTestApplicationComponentWithLearnerAnalyticsStudy()
     val bundle = Bundle()
 
@@ -1799,6 +1849,10 @@ class EventBundleCreatorTest {
     playVoiceOverContext: PlayVoiceOverContext = createPlayVoiceOverContextDetails()
   ) = createEventContext(playVoiceOverContext, EventContextBuilder::setPlayVoiceOverContext)
 
+  private fun createPauseVoiceOverContext(
+    playVoiceOverContext: PlayVoiceOverContext = createPauseVoiceOverContextDetails()
+  ) = createEventContext(playVoiceOverContext, EventContextBuilder::setPauseVoiceOverContext)
+
   private fun createAppInBackgroundContext(
     learnerDetails: LearnerDetailsContext = createLearnerDetailsContext()
   ) = createEventContext(learnerDetails, EventContextBuilder::setAppInBackgroundContext)
@@ -1936,6 +1990,16 @@ class EventBundleCreatorTest {
     this.languageCode = languageCode
   }.build()
 
+  private fun createPauseVoiceOverContextDetails(
+    explorationDetails: ExplorationContext = createExplorationContext(),
+    contentId: String = TEST_CONTENT_ID,
+    languageCode: String = TEST_LANGUAGE_CODE
+  ) = PlayVoiceOverContext.newBuilder().apply {
+    this.explorationDetails = explorationDetails
+    this.contentId = contentId
+    this.languageCode = languageCode
+  }.build()
+
   private fun registerTestApplication() {
     val packageManager = Shadows.shadowOf(context.packageManager)
     val applicationInfo =
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 4664fd4d837..a5c3d0ffdc3 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
@@ -41,6 +41,7 @@ import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.OPEN_QUE
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.OPEN_REVISION_CARD
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.OPEN_REVISION_TAB
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.OPEN_STORY_ACTIVITY
+import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.PAUSE_VOICE_OVER_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.PLAY_VOICE_OVER_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.RESUME_EXPLORATION_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.SOLUTION_OFFERED_CONTEXT
@@ -201,7 +202,7 @@ class KenyaAlphaEventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_openExpActivityEvent_studyOn_fillsOnlyNonSensitiveFieldsAndRetsName() {
+  fun testFillEventBundle_openExpActivityEvent_studyOn_fillsAllFieldsAndReturnsName() {
     setUpTestApplicationComponentWithLearnerAnalyticsStudy()
     val bundle = Bundle()
 
@@ -407,7 +408,7 @@ class KenyaAlphaEventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_startCardContextEvent_studyOn_fillsOnlyNonSensitiveFieldsAndRetsName() {
+  fun testFillEventBundle_startCardContextEvent_studyOn_fillsAllFieldsAndReturnsName() {
     setUpTestApplicationComponentWithLearnerAnalyticsStudy()
     val bundle = Bundle()
 
@@ -459,7 +460,7 @@ class KenyaAlphaEventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_endCardContextEvent_studyOn_fillsOnlyNonSensitiveFieldsAndRetsName() {
+  fun testFillEventBundle_endCardContextEvent_studyOn_fillsAllFieldsAndReturnsName() {
     setUpTestApplicationComponentWithLearnerAnalyticsStudy()
     val bundle = Bundle()
 
@@ -511,7 +512,7 @@ class KenyaAlphaEventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_hintOfferedEvent_studyOn_fillsOnlyNonSensitiveFieldsAndRetsName() {
+  fun testFillEventBundle_hintOfferedEvent_studyOn_fillsAllFieldsAndReturnsName() {
     setUpTestApplicationComponentWithLearnerAnalyticsStudy()
     val bundle = Bundle()
 
@@ -563,7 +564,7 @@ class KenyaAlphaEventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_accessHintContextEvent_studyOn_fillsOnlyNonSensitiveFieldsAndRetsName() {
+  fun testFillEventBundle_accessHintContextEvent_studyOn_fillsAllFieldsAndReturnsName() {
     setUpTestApplicationComponentWithLearnerAnalyticsStudy()
     val bundle = Bundle()
 
@@ -614,7 +615,7 @@ class KenyaAlphaEventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_solutionOfferedEvent_studyOn_fillsOnlyNonSensitiveFieldsAndRetsName() {
+  fun testFillEventBundle_solutionOfferedEvent_studyOn_fillsAllFieldsAndReturnsName() {
     setUpTestApplicationComponentWithLearnerAnalyticsStudy()
     val bundle = Bundle()
 
@@ -664,7 +665,7 @@ class KenyaAlphaEventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_accessSolutionEvent_studyOn_fillsOnlyNonSensitiveFieldsAndRetsName() {
+  fun testFillEventBundle_accessSolutionEvent_studyOn_fillsAllFieldsAndReturnsName() {
     setUpTestApplicationComponentWithLearnerAnalyticsStudy()
     val bundle = Bundle()
 
@@ -716,7 +717,7 @@ class KenyaAlphaEventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_submitAnswerEvent_studyOn_fillsOnlyNonSensitiveFieldsAndRetsName() {
+  fun testFillEventBundle_submitAnswerEvent_studyOn_fillsAllFieldsAndReturnsName() {
     setUpTestApplicationComponentWithLearnerAnalyticsStudy()
     val bundle = Bundle()
 
@@ -770,7 +771,7 @@ class KenyaAlphaEventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_playVoiceOverEvent_studyOn_fillsOnlyNonSensitiveFieldsAndRetsName() {
+  fun testFillEventBundle_playVoiceOverEvent_studyOn_fillsAllFieldsAndReturnsName() {
     setUpTestApplicationComponentWithLearnerAnalyticsStudy()
     val bundle = Bundle()
 
@@ -797,10 +798,59 @@ class KenyaAlphaEventBundleCreatorTest {
     assertThat(bundle).string("ed_ld_install_id").isEqualTo(TEST_INSTALLATION_ID)
   }
 
-  // TODO: Add tests.
-  // - Update all "studyOn" cases to match the new one below.
-  // - testFillEventBundle_pauseVoiceOverEvent_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName
-  // - testFillEventBundle_pauseVoiceOverEvent_studyOn_fillsAllFieldsAndReturnsName
+  @Test
+  fun testFillEventBundle_pauseVoiceOverEvent_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName() {
+    setUpTestApplicationComponentWithoutLearnerAnalyticsStudy()
+    val bundle = Bundle()
+
+    val eventLog = createEventLog(context = createPauseVoiceOverContext())
+
+    val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
+    assertThat(typeName).isEqualTo("pause_voice_over_context")
+    assertThat(bundle).hasSize(14)
+    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_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)
+    assertThat(bundle).string("ed_session_id").isEqualTo(TEST_LEARNER_SESSION_ID)
+    assertThat(bundle).string("ed_exploration_version").isEqualTo(TEST_EXPLORATION_VERSION_STR)
+    assertThat(bundle).string("ed_state_name").isEqualTo(TEST_STATE_NAME)
+    assertThat(bundle).string("content_id").isEqualTo(TEST_CONTENT_ID)
+    assertThat(bundle).string("language_code").isEqualTo(TEST_LANGUAGE_CODE)
+  }
+
+  @Test
+  fun testFillEventBundle_pauseVoiceOverEvent_studyOn_fillsAllFieldsAndReturnsName() {
+    setUpTestApplicationComponentWithLearnerAnalyticsStudy()
+    val bundle = Bundle()
+
+    val eventLog = createEventLog(context = createPauseVoiceOverContext())
+
+    val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
+    assertThat(typeName).isEqualTo("pause_voice_over_context")
+    assertThat(bundle).hasSize(16)
+    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_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)
+    assertThat(bundle).string("ed_session_id").isEqualTo(TEST_LEARNER_SESSION_ID)
+    assertThat(bundle).string("ed_exploration_version").isEqualTo(TEST_EXPLORATION_VERSION_STR)
+    assertThat(bundle).string("ed_state_name").isEqualTo(TEST_STATE_NAME)
+    assertThat(bundle).string("content_id").isEqualTo(TEST_CONTENT_ID)
+    assertThat(bundle).string("language_code").isEqualTo(TEST_LANGUAGE_CODE)
+    assertThat(bundle).string("ed_ld_learner_id").isEqualTo(TEST_LEARNER_ID)
+    assertThat(bundle).string("ed_ld_install_id").isEqualTo(TEST_INSTALLATION_ID)
+  }
 
   @Test
   fun testFillEventBundle_appInBackgroundEvent_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName() {
@@ -821,7 +871,7 @@ class KenyaAlphaEventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_appInBackgroundEvent_studyOn_fillsOnlyNonSensitiveFieldsAndRetsName() {
+  fun testFillEventBundle_appInBackgroundEvent_studyOn_fillsAllFieldsAndReturnsName() {
     setUpTestApplicationComponentWithLearnerAnalyticsStudy()
     val bundle = Bundle()
 
@@ -859,7 +909,7 @@ class KenyaAlphaEventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_appInForegroundEvent_studyOn_fillsOnlyNonSensitiveFieldsAndRetsName() {
+  fun testFillEventBundle_appInForegroundEvent_studyOn_fillsAllFieldsAndReturnsName() {
     setUpTestApplicationComponentWithLearnerAnalyticsStudy()
     val bundle = Bundle()
 
@@ -903,7 +953,7 @@ class KenyaAlphaEventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_exitExplorationEvent_studyOn_fillsOnlyNonSensitiveFieldsAndRetsName() {
+  fun testFillEventBundle_exitExplorationEvent_studyOn_fillsAllFieldsAndReturnsName() {
     setUpTestApplicationComponentWithLearnerAnalyticsStudy()
     val bundle = Bundle()
 
@@ -953,7 +1003,7 @@ class KenyaAlphaEventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_finishExplorationEvent_studyOn_fillsOnlyNonSensitiveFieldsAndRetsName() {
+  fun testFillEventBundle_finishExplorationEvent_studyOn_fillsAllFieldsAndReturnsName() {
     setUpTestApplicationComponentWithLearnerAnalyticsStudy()
     val bundle = Bundle()
 
@@ -997,7 +1047,7 @@ class KenyaAlphaEventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_resumeExplorationEvent_studyOn_fillsOnlyNonSensitiveFieldsAndRetsName() {
+  fun testFillEventBundle_resumeExplorationEvent_studyOn_fillsAllFieldsAndReturnsName() {
     setUpTestApplicationComponentWithLearnerAnalyticsStudy()
     val bundle = Bundle()
 
@@ -1035,7 +1085,7 @@ class KenyaAlphaEventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_startOverExpEvent_studyOn_fillsOnlyNonSensitiveFieldsAndRetsName() {
+  fun testFillEventBundle_startOverExpEvent_studyOn_fillsAllFieldsAndReturnsName() {
     setUpTestApplicationComponentWithLearnerAnalyticsStudy()
     val bundle = Bundle()
 
@@ -1073,7 +1123,7 @@ class KenyaAlphaEventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_deleteProfileEvent_studyOn_fillsOnlyNonSensitiveFieldsAndRetsName() {
+  fun testFillEventBundle_deleteProfileEvent_studyOn_fillsAllFieldsAndReturnsName() {
     setUpTestApplicationComponentWithLearnerAnalyticsStudy()
     val bundle = Bundle()
 
@@ -1147,7 +1197,7 @@ class KenyaAlphaEventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_failedEventInstallId_studyOn_fillsOnlyNonSensitiveFieldsAndRetsName() {
+  fun testFillEventBundle_failedEventInstallId_studyOn_fillsAllFieldsAndReturnsName() {
     setUpTestApplicationComponentWithLearnerAnalyticsStudy()
     val bundle = Bundle()
 
@@ -1233,6 +1283,10 @@ class KenyaAlphaEventBundleCreatorTest {
     playVoiceOverContext: PlayVoiceOverContext = createPlayVoiceOverContextDetails()
   ) = createEventContext(playVoiceOverContext, EventContextBuilder::setPlayVoiceOverContext)
 
+  private fun createPauseVoiceOverContext(
+    playVoiceOverContext: PlayVoiceOverContext = createPauseVoiceOverContextDetails()
+  ) = createEventContext(playVoiceOverContext, EventContextBuilder::setPauseVoiceOverContext)
+
   private fun createAppInBackgroundContext(
     learnerDetails: LearnerDetailsContext = createLearnerDetailsContext()
   ) = createEventContext(learnerDetails, EventContextBuilder::setAppInBackgroundContext)
@@ -1366,6 +1420,16 @@ class KenyaAlphaEventBundleCreatorTest {
     this.languageCode = languageCode
   }.build()
 
+  private fun createPauseVoiceOverContextDetails(
+    explorationDetails: ExplorationContext = createExplorationContext(),
+    contentId: String = TEST_CONTENT_ID,
+    languageCode: String = TEST_LANGUAGE_CODE
+  ) = PlayVoiceOverContext.newBuilder().apply {
+    this.explorationDetails = explorationDetails
+    this.contentId = contentId
+    this.languageCode = languageCode
+  }.build()
+
   private fun registerTestApplication() {
     val packageManager = Shadows.shadowOf(context.packageManager)
     val applicationInfo =

From c109c7c7c07f91e897385b75ad46af3a299bfc6f Mon Sep 17 00:00:00 2001
From: Ben Henning <ben@oppia.org>
Date: Thu, 19 Jan 2023 22:27:05 -0800
Subject: [PATCH 17/38] Fix broken Gradle tests.

---
 ...single_interactive_state_exp_with_hints_and_solution.json | 4 +++-
 ...gle_interactive_state_exp_with_one_hint_and_solution.json | 4 +++-
 ...test_single_interactive_state_exp_with_only_solution.json | 4 +++-
 ...e_interactive_state_exp_with_solution_missing_answer.json | 1 +
 .../java/org/oppia/android/domain/util/StateRetriever.kt     | 5 +++--
 .../org/oppia/android/domain/topic/TopicControllerTest.kt    | 2 +-
 6 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/domain/src/main/assets/test_single_interactive_state_exp_with_hints_and_solution.json b/domain/src/main/assets/test_single_interactive_state_exp_with_hints_and_solution.json
index 323d604f3da..98375106530 100644
--- a/domain/src/main/assets/test_single_interactive_state_exp_with_hints_and_solution.json
+++ b/domain/src/main/assets/test_single_interactive_state_exp_with_hints_and_solution.json
@@ -62,7 +62,9 @@
           }],
           "solution": {
             "answer_is_exclusive": false,
-            "correct_answer": "Finnish",
+            "correct_answer": {
+              "normalized_string": "Finnish"
+            },
             "explanation": {
               "content_id": "solution",
               "html": "<p>'Oppia' is translated from Finnish.</p>"
diff --git a/domain/src/main/assets/test_single_interactive_state_exp_with_one_hint_and_solution.json b/domain/src/main/assets/test_single_interactive_state_exp_with_one_hint_and_solution.json
index 9ef0a1c1a37..e3da0827ca0 100644
--- a/domain/src/main/assets/test_single_interactive_state_exp_with_one_hint_and_solution.json
+++ b/domain/src/main/assets/test_single_interactive_state_exp_with_one_hint_and_solution.json
@@ -57,7 +57,9 @@
           }],
           "solution": {
             "answer_is_exclusive": false,
-            "correct_answer": "Finnish",
+            "correct_answer": {
+              "normalized_string": "Finnish"
+            },
             "explanation": {
               "content_id": "solution",
               "html": "<p>'Oppia' is translated from Finnish.</p>"
diff --git a/domain/src/main/assets/test_single_interactive_state_exp_with_only_solution.json b/domain/src/main/assets/test_single_interactive_state_exp_with_only_solution.json
index e5aa182f58a..72f80c1f6fd 100644
--- a/domain/src/main/assets/test_single_interactive_state_exp_with_only_solution.json
+++ b/domain/src/main/assets/test_single_interactive_state_exp_with_only_solution.json
@@ -52,7 +52,9 @@
           "hints": [],
           "solution": {
             "answer_is_exclusive": false,
-            "correct_answer": "Finnish",
+            "correct_answer": {
+              "normalized_string": "Finnish"
+            },
             "explanation": {
               "content_id": "solution",
               "html": "<p>'Oppia' is translated from Finnish.</p>"
diff --git a/domain/src/main/assets/test_single_interactive_state_exp_with_solution_missing_answer.json b/domain/src/main/assets/test_single_interactive_state_exp_with_solution_missing_answer.json
index 5ddc99450b0..514e7f71cd3 100644
--- a/domain/src/main/assets/test_single_interactive_state_exp_with_solution_missing_answer.json
+++ b/domain/src/main/assets/test_single_interactive_state_exp_with_solution_missing_answer.json
@@ -52,6 +52,7 @@
           "hints": [],
           "solution": {
             "answer_is_exclusive": false,
+            "correct_answer": null,
             "explanation": {
               "content_id": "solution",
               "html": "<p>'Oppia' is translated from Finnish.</p>"
diff --git a/domain/src/main/java/org/oppia/android/domain/util/StateRetriever.kt b/domain/src/main/java/org/oppia/android/domain/util/StateRetriever.kt
index f6450d4a0f8..227079a0640 100644
--- a/domain/src/main/java/org/oppia/android/domain/util/StateRetriever.kt
+++ b/domain/src/main/java/org/oppia/android/domain/util/StateRetriever.kt
@@ -158,7 +158,7 @@ class StateRetriever @Inject constructor() {
     return optionalSolutionJson?.let { solutionJson ->
       return Solution.newBuilder().apply {
         correctAnswer =
-          parseExactSolutionObject(solutionJson.getJSONObject("correct_answer"), interactionId)
+          parseExactSolutionObject(solutionJson.optJSONObject("correct_answer"), interactionId)
         explanation = parseSubtitledHtml(solutionJson.getJSONObject("explanation"))
         answerIsExclusive = solutionJson.getBoolean("answer_is_exclusive")
       }.build()
@@ -387,9 +387,10 @@ class StateRetriever @Inject constructor() {
   }
 
   private fun parseExactSolutionObject(
-    inputJson: JSONObject,
+    inputJson: JSONObject?,
     interactionId: String
   ): InteractionObject {
+    if (inputJson == null) return InteractionObject.getDefaultInstance()
     return when (interactionId) {
       "TextInput" -> {
         InteractionObject.newBuilder().apply {
diff --git a/domain/src/test/java/org/oppia/android/domain/topic/TopicControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/topic/TopicControllerTest.kt
index 940546a50bc..de4e9fa5cea 100755
--- a/domain/src/test/java/org/oppia/android/domain/topic/TopicControllerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/topic/TopicControllerTest.kt
@@ -439,7 +439,7 @@ class TopicControllerTest {
 
     val ephemeralConceptCard = monitorFactory.waitForNextSuccessfulResult(conceptCardProvider)
     assertThat(ephemeralConceptCard.conceptCard.explanation.html)
-      .isEqualTo("Explanation with <b>rich text</b>.")
+      .contains("Explanation with <b>rich text</b>.")
   }
 
   @Test

From 51b83f3a231052ab117530e872daaa1b7c3a6b64 Mon Sep 17 00:00:00 2001
From: Ben Henning <ben@oppia.org>
Date: Thu, 19 Jan 2023 22:43:48 -0800
Subject: [PATCH 18/38] Address reviewer comments.

---
 app/src/main/AndroidManifest.xml                             | 2 +-
 .../app/player/exploration/ExplorationActivityTest.kt        | 3 ++-
 model/src/main/proto/oppia_logger.proto                      | 5 +++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6c3512d1552..0c112106d33 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -18,7 +18,7 @@
     <!-- NOTE TO DEVELOPER: You can enable debug logs for fast upload & better inspection in Firebase console using https://support.google.com/analytics/answer/7201382. -->
     <meta-data
       android:name="firebase_analytics_collection_deactivated"
-      android:value="false" />
+      android:value="true" />
     <meta-data
       android:name="firebase_crashlytics_collection_enabled"
       android:value="false" />
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 b36ee9eaf25..c51e9dd65a8 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
@@ -1924,8 +1924,9 @@ class ExplorationActivityTest {
       openHintsAndSolutionsDialog()
       pressRevealHintButton(hintPosition = 0)
 
+      // TODO(#4848): Fix content description generation & update this test to verify using the
+      //  correct text.
       // Ensure the hint description is correct and doesn't contain any HTML.
-      // TODO: File an issue for the broken content description rendering from HTML (needs more work & needs to be generically).
       onView(withId(R.id.hints_and_solution_summary))
         .check(
           matches(
diff --git a/model/src/main/proto/oppia_logger.proto b/model/src/main/proto/oppia_logger.proto
index 62f77ee3284..a27dd9cd88a 100644
--- a/model/src/main/proto/oppia_logger.proto
+++ b/model/src/main/proto/oppia_logger.proto
@@ -210,8 +210,9 @@ message EventLog {
     // Defined attributes that are common among other exploration related event log contexts.
     ExplorationContext exploration_details = 1;
 
-    // Not sure if this was ever actually a value, but reserving it to ensure no incompatibilities
-    // occur.
+    // This field index was previously skipped, so it's been marked as reserved to ensure no
+    // possible binary compatibility issues occur in the future due to potential developer
+    // confusion.
     reserved 2;
 
     // The content id of the voiceover recording being played.

From afc381755dfe6e7d87bf53bdad050c51e4f9b05a Mon Sep 17 00:00:00 2001
From: Ben Henning <ben@oppia.org>
Date: Fri, 20 Jan 2023 13:31:32 -0800
Subject: [PATCH 19/38] Update version.bzl

---
 version.bzl | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/version.bzl b/version.bzl
index 657338837c9..2e1ca0aa781 100644
--- a/version.bzl
+++ b/version.bzl
@@ -10,10 +10,10 @@ MAJOR_VERSION = 0
 MINOR_VERSION = 10
 
 # TODO(#4419): Remove the Kenya-specific alpha version code.
-OPPIA_DEV_KITKAT_VERSION_CODE = 48
-OPPIA_DEV_VERSION_CODE = 49
-OPPIA_ALPHA_KITKAT_VERSION_CODE = 50
-OPPIA_ALPHA_VERSION_CODE = 51
-OPPIA_ALPHA_KENYA_VERSION_CODE = 52
-OPPIA_BETA_VERSION_CODE = 53
-OPPIA_GA_VERSION_CODE = 54
+OPPIA_DEV_KITKAT_VERSION_CODE = 61
+OPPIA_DEV_VERSION_CODE = 60
+OPPIA_ALPHA_KITKAT_VERSION_CODE = 59
+OPPIA_ALPHA_VERSION_CODE = 58
+OPPIA_ALPHA_KENYA_VERSION_CODE = 57
+OPPIA_BETA_VERSION_CODE = 56
+OPPIA_GA_VERSION_CODE = 55

From 8065e64c97103d022e0ac64b7a2ff63eee2603ad Mon Sep 17 00:00:00 2001
From: Ben Henning <ben@oppia.org>
Date: Fri, 20 Jan 2023 13:46:08 -0800
Subject: [PATCH 20/38] Assorted fixes.

- Fixes a test broken in Gradle.
- Repurposes a now unused color for the new secondary button style.
- Fixes landscape support in profile_edit_fragment for the new modify
progress flow.
---
 .../res/layout-land/profile_edit_fragment.xml | 22 ++++++++++++++++++-
 .../main/res/values-night/color_palette.xml   |  2 +-
 app/src/main/res/values/color_palette.xml     |  2 +-
 app/src/main/res/values/component_colors.xml  |  2 +-
 .../profile/ProfileEditFragmentTest.kt        |  4 ++++
 .../player/state/StateFragmentLocalTest.kt    |  1 +
 6 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/layout-land/profile_edit_fragment.xml b/app/src/main/res/layout-land/profile_edit_fragment.xml
index 65703ff695e..725ff869a79 100644
--- a/app/src/main/res/layout-land/profile_edit_fragment.xml
+++ b/app/src/main/res/layout-land/profile_edit_fragment.xml
@@ -111,6 +111,26 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/profile_rename_button" />
 
+      <Button
+        android:id="@+id/profile_mark_chapters_for_completion_button"
+        style="?android:attr/borderlessButtonStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/general_item_background_border"
+        android:fontFamily="sans-serif"
+        android:gravity="start|center_vertical"
+        android:minHeight="48dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:text="@string/profile_edit_mark_chapter_completion"
+        android:textAllCaps="false"
+        android:textColor="@color/component_color_shared_primary_text_color"
+        android:textSize="16sp"
+        android:visibility="@{viewModel.isAllowedToMarkFinishedChapters ? View.VISIBLE : View.GONE}"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/profile_reset_button" />
+
       <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/profile_edit_allow_download_container"
         android:layout_width="match_parent"
@@ -121,7 +141,7 @@
         android:visibility="@{viewModel.showEditDownloadAccess ? View.VISIBLE : View.GONE}"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/profile_reset_button">
+        app:layout_constraintTop_toBottomOf="@id/profile_mark_chapters_for_completion_button">
 
         <TextView
           android:id="@+id/profile_edit_allow_download_heading"
diff --git a/app/src/main/res/values-night/color_palette.xml b/app/src/main/res/values-night/color_palette.xml
index 230386dc464..fa73f840d0f 100644
--- a/app/src/main/res/values-night/color_palette.xml
+++ b/app/src/main/res/values-night/color_palette.xml
@@ -23,7 +23,7 @@
   <color name="color_palette_toolbar_shadow_color">@color/color_def_black_24</color>
   <color name="color_palette_toolbar_text_color">@color/color_def_white</color>
   <color name="color_palette_secondary_toolbar_color">@color/color_def_forest_green</color>
-  <color name="color_palette_shared_resume_lesson_start_over_button_color">@color/color_def_oppia_green</color>
+  <color name="color_palette_secondary_button_background_color">@color/color_def_oppia_green</color>
   <color name="color_palette_status_bar_color">@color/color_def_dark_green</color>
   <color name="color_palette_action_bar_color">@color/color_def_oppia_green</color>
   <color name="color_palette_highlighted_background_color">@color/color_def_highlight_blue_darker</color>
diff --git a/app/src/main/res/values/color_palette.xml b/app/src/main/res/values/color_palette.xml
index 4ad324d81bd..3bd9933fce5 100644
--- a/app/src/main/res/values/color_palette.xml
+++ b/app/src/main/res/values/color_palette.xml
@@ -24,7 +24,7 @@
   <color name="color_palette_toolbar_shadow_color">@color/color_def_black_24</color>
   <color name="color_palette_toolbar_text_color">@color/color_def_white</color>
   <color name="color_palette_secondary_toolbar_color">@color/color_def_oppia_green</color>
-  <color name="color_palette_shared_resume_lesson_start_over_button_color">@color/color_def_oppia_green</color>
+  <color name="color_palette_secondary_button_background_color">@color/color_def_oppia_green</color>
   <color name="color_palette_status_bar_color">@color/color_def_dark_green</color>
   <color name="color_palette_action_bar_color">@color/color_def_oppia_green</color>
   <color name="color_palette_highlighted_background_color">@color/color_def_highlight_blue</color>
diff --git a/app/src/main/res/values/component_colors.xml b/app/src/main/res/values/component_colors.xml
index 7d12d293401..6211880a898 100644
--- a/app/src/main/res/values/component_colors.xml
+++ b/app/src/main/res/values/component_colors.xml
@@ -22,7 +22,7 @@
   <color name="component_color_shared_previous_responses_header_item_container_background_color">@color/color_palette_highlighted_text_color</color>
   <color name="component_color_shared_transparent_background_color">@color/color_palette_transparent_background_color</color>
   <color name="component_color_shared_white_background_color">@color/color_palette_shared_white_background_color</color>
-  <color name="component_color_shared_secondary_button_background_color">@color/color_palette_secondary_toolbar_color</color>
+  <color name="component_color_shared_secondary_button_background_color">@color/color_palette_secondary_button_background_color</color>
   <color name="component_color_shared_hints_background_color">@color/color_palette_shared_hints_background_color</color>
   <color name="component_color_shared_previous_responses_header_item_text_color">@color/color_palette_highlighted_text_color</color>
   <color name="component_color_shared_input_interaction_edit_text_color">@color/color_palette_highlighted_text_color</color>
diff --git a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditFragmentTest.kt
index c9f88aa6616..0b2bb33c202 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditFragmentTest.kt
@@ -168,6 +168,7 @@ class ProfileEditFragmentTest {
   }
 
   @Test
+  @Config(qualifiers = "land")
   fun testProfileEdit_configChange_startWithUserProfile_clickDelete_checkOpensDeletionDialog() {
     launch<ProfileEditFragmentTestActivity>(
       ProfileEditFragmentTestActivity.createProfileEditFragmentTestActivity(
@@ -184,6 +185,7 @@ class ProfileEditFragmentTest {
   }
 
   @Test
+  @Config(qualifiers = "land")
   fun testProfileEdit_startWithUserProfile_clickDelete_configChange_checkDeletionDialogIsVisible() {
     launch<ProfileEditFragmentTestActivity>(
       ProfileEditFragmentTestActivity.createProfileEditFragmentTestActivity(
@@ -258,6 +260,7 @@ class ProfileEditFragmentTest {
   }
 
   @Test
+  @Config(qualifiers = "land")
   fun testProfileEdit_configChange_userHasDownloadAccess_downloadsEnabled_checkSwitchIsChecked() {
     TestPlatformParameterModule.forceEnableDownloadsSupport(true)
     val addProfileProvider = profileManagementController.addProfile(
@@ -415,6 +418,7 @@ class ProfileEditFragmentTest {
   }
 
   @Test
+  @Config(qualifiers = "land")
   fun testProfileEdit_studyOn_landscape_hasMarkChaptersCompletedButton() {
     TestPlatformParameterModule.forceEnableLearnerStudyAnalytics(true)
     launch<ProfileEditFragmentTestActivity>(
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 5f5cf703176..864ac67c862 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
@@ -1664,6 +1664,7 @@ class StateFragmentLocalTest {
   }
 
   @Test
+  @RunOn(buildEnvironments = [BuildEnvironment.BAZEL]) // Languages unsupported in Gradle builds.
   fun testStateFragment_stateWithAlgebraicExpr_showSolution_solutionHasCorrectHtmlContentDesc() {
     launchForExploration(TEST_EXPLORATION_ID_5).use { scenario ->
       // Play through the first three states.

From 39dafc06dd00a5677bf2e7e393bf66c2fdeb1ae5 Mon Sep 17 00:00:00 2001
From: Ben Henning <ben@oppia.org>
Date: Mon, 30 Jan 2023 03:43:33 -0800
Subject: [PATCH 21/38] Many more fixes/changes per feedback.

This includes:
- Fixing image sizing issues
- Fixing bullet/numbered list formatting issues
- Moving the in-lesson Swahili language switcher to also be behind an
admin-configurable per-profile setting
- Logging a new event for when the in-lesson language switch button is
clicked
- Logging a new event for when the user exits a revision card
- Updating all events to include app/content/audio language settings for
the user
- Updating the in-lesson language switch button to only show if the
content of a card is available in Swahili
- Updating the switch-to-Swahili button's text to be in Swahili when the
rest of the strings are in English
- Fixing an issue with session ID to ensure it gets reset properly upon
profile login
- Fixing an issue where switching between tabs in the topic screen
wasn't actually logging events for the switches
- Introducing a new share button in the learner analytics screen to make
it easier to record per-device IDs

Miscellaneous other refactors and/or fixes were also done, as needed,
and per feedback.
---
 app/BUILD.bazel                               |   2 +
 .../ProfileAndDeviceIdFragmentPresenter.kt    |  43 +-
 .../learneranalytics/ProfileListViewModel.kt  |  24 +-
 .../learneranalytics/ShareIdsViewModel.kt     |  58 +++
 .../android/app/home/HomeFragmentPresenter.kt |   8 +-
 .../ExplorationFragmentPresenter.kt           |   8 +-
 .../app/player/state/StateViewModel.kt        |  55 ++-
 .../ProfileChooserFragmentPresenter.kt        |   7 +-
 .../profile/ProfileEditFragmentPresenter.kt   |  57 ++-
 .../settings/profile/ProfileEditViewModel.kt  |  10 +-
 .../app/story/StoryFragmentPresenter.kt       |  16 +-
 .../app/topic/TopicFragmentPresenter.kt       |  38 +-
 .../ConceptCardFragmentPresenter.kt           |   6 +-
 .../QuestionPlayerFragmentPresenter.kt        |   9 +-
 .../ReturnToTopicClickListener.kt             |   5 +-
 .../revisioncard/RevisionCardActivity.kt      |   9 +-
 .../RevisionCardActivityPresenter.kt          |  11 +-
 .../RevisionCardFragmentPresenter.kt          |   7 +-
 .../oppia/android/app/translation/BUILD.bazel |   1 +
 .../res/layout-land/profile_edit_fragment.xml |  63 ++-
 .../main/res/layout/profile_edit_fragment.xml |  63 ++-
 .../layout/profile_list_share_ids_item.xml    |  27 ++
 app/src/main/res/layout/state_fragment.xml    |   2 +-
 app/src/main/res/values/strings.xml           |   2 +
 .../main/res/values/untranslated_strings.xml  |   3 +-
 .../ProfileAndDeviceIdFragmentTest.kt         |  46 +-
 .../android/app/player/state/BUILD.bazel      |   1 +
 .../app/player/state/StateFragmentTest.kt     | 138 ++++--
 .../profile/ProfileEditFragmentTest.kt        | 267 +++++-----
 .../android/app/topic/TopicFragmentTest.kt    | 128 ++++-
 .../revisioncard/RevisionCardActivityTest.kt  | 137 +++++-
 domain/src/main/assets/test_topic_id_0_1.json |   4 +-
 .../main/assets/test_topic_id_0_1.textproto   |   4 +-
 .../ExplorationProgressController.kt          |  39 +-
 .../android/domain/oppialogger/BUILD.bazel    |   1 -
 .../LoggingIdentifierController.kt            |   4 +-
 .../android/domain/oppialogger/OppiaLogger.kt |  46 +-
 .../analytics/AnalyticsController.kt          |  80 ++-
 .../analytics/ApplicationLifecycleObserver.kt |   6 +-
 .../domain/oppialogger/analytics/BUILD.bazel  |   2 +
 .../analytics/LearnerAnalyticsLogger.kt       | 103 +++-
 .../profile/ProfileManagementController.kt    | 111 ++++-
 .../translation/TranslationController.kt      | 225 ++++++---
 .../domain/audio/AudioPlayerControllerTest.kt |  18 +
 .../ExplorationProgressControllerTest.kt      | 124 ++++-
 .../domain/oppialogger/OppiaLoggerTest.kt     |  35 +-
 .../analytics/AnalyticsControllerTest.kt      | 362 ++++++++++++--
 .../domain/oppialogger/analytics/BUILD.bazel  |   1 +
 .../analytics/LearnerAnalyticsLoggerTest.kt   | 296 ++++++++++--
 .../loguploader/LogUploadWorkerTest.kt        |  26 +-
 .../ProfileManagementControllerTest.kt        | 285 ++++++++++-
 .../translation/TranslationControllerTest.kt  | 455 ++++++++++++++++++
 model/src/main/proto/BUILD.bazel              |   5 +-
 model/src/main/proto/oppia_logger.proto       |  40 +-
 model/src/main/proto/profile.proto            |   4 +
 .../assets/kdoc_validity_exemptions.textproto |   2 -
 scripts/assets/test_file_exemptions.textproto |   2 +-
 .../testing/logging/EventLogSubject.kt        | 345 ++++++++++++-
 .../util/logging/EventBundleCreator.kt        | 256 ++++++----
 ...entTypeToHumanReadableNameConverterImpl.kt |   6 +-
 ...entTypeToHumanReadableNameConverterImpl.kt |   6 +-
 .../android/util/parser/html/BUILD.bazel      |  14 -
 .../parser/html/CustomHtmlContentHandler.kt   |  23 +-
 .../android/util/parser/html/LiTagHandler.kt  | 297 ++++++++----
 .../parser/html/ListItemLeadingMarginSpan.kt  | 152 +++---
 .../android/util/parser/html/ListItemMark.kt  |  10 -
 .../util/parser/image/UrlImageParser.kt       |  69 ++-
 .../util/parser/svg/ScalableVectorGraphic.kt  |  37 +-
 .../util/parser/svg/SvgPictureDrawable.kt     |  48 +-
 utility/src/main/res/values/dimens.xml        |  11 +-
 .../util/logging/EventBundleCreatorTest.kt    | 432 +++++++++++++----
 .../KenyaAlphaEventBundleCreatorTest.kt       | 233 ++++++---
 72 files changed, 4355 insertions(+), 1115 deletions(-)
 create mode 100644 app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ShareIdsViewModel.kt
 create mode 100644 app/src/main/res/layout/profile_list_share_ids_item.xml
 delete mode 100644 utility/src/main/java/org/oppia/android/util/parser/html/ListItemMark.kt

diff --git a/app/BUILD.bazel b/app/BUILD.bazel
index 10a17c41919..b0f77c14f9d 100644
--- a/app/BUILD.bazel
+++ b/app/BUILD.bazel
@@ -189,6 +189,7 @@ VIEW_MODELS_WITH_RESOURCE_IMPORTS = [
     "src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/DeviceIdItemViewModel.kt",
     "src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileLearnerIdItemViewModel.kt",
     "src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileListViewModel.kt",
+    "src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ShareIdsViewModel.kt",
     "src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/SyncStatusItemViewModel.kt",
     "src/main/java/org/oppia/android/app/devoptions/forcenetworktype/ForceNetworkTypeViewModel.kt",
     "src/main/java/org/oppia/android/app/devoptions/mathexpressionparser/MathExpressionParserViewModel.kt",
@@ -874,6 +875,7 @@ TEST_DEPS = [
     "//testing/src/main/java/org/oppia/android/testing/espresso:konfetti_view_matcher",
     "//testing/src/main/java/org/oppia/android/testing/espresso:text_input_action",
     "//testing/src/main/java/org/oppia/android/testing/junit:initialize_default_locale_rule",
+    "//testing/src/main/java/org/oppia/android/testing/logging:event_log_subject",
     "//testing/src/main/java/org/oppia/android/testing/math:math_equation_subject",
     "//testing/src/main/java/org/oppia/android/testing/math:math_expression_subject",
     "//testing/src/main/java/org/oppia/android/testing/mockito",
diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdFragmentPresenter.kt
index e75218bb232..dd008b8aaad 100644
--- a/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdFragmentPresenter.kt
@@ -10,6 +10,7 @@ import org.oppia.android.app.recyclerview.BindableAdapter
 import org.oppia.android.databinding.ProfileAndDeviceIdFragmentBinding
 import org.oppia.android.databinding.ProfileListDeviceIdItemBinding
 import org.oppia.android.databinding.ProfileListLearnerIdItemBinding
+import org.oppia.android.databinding.ProfileListShareIdsItemBinding
 import org.oppia.android.databinding.ProfileListSyncStatusItemBinding
 import javax.inject.Inject
 
@@ -46,27 +47,29 @@ class ProfileAndDeviceIdFragmentPresenter @Inject constructor(
         is DeviceIdItemViewModel -> ProfileListItemViewType.DEVICE_ID
         is ProfileLearnerIdItemViewModel -> ProfileListItemViewType.LEARNER_ID
         is SyncStatusItemViewModel -> ProfileListItemViewType.SYNC_STATUS
+        is ShareIdsViewModel -> ProfileListItemViewType.SHARE_IDS
         else -> error("Encountered unexpected view model: $viewModel")
       }
-    }
-      .registerViewDataBinder(
-        viewType = ProfileListItemViewType.DEVICE_ID,
-        inflateDataBinding = ProfileListDeviceIdItemBinding::inflate,
-        setViewModel = ProfileListDeviceIdItemBinding::setViewModel,
-        transformViewModel = { it as DeviceIdItemViewModel }
-      )
-      .registerViewDataBinder(
-        viewType = ProfileListItemViewType.LEARNER_ID,
-        inflateDataBinding = ProfileListLearnerIdItemBinding::inflate,
-        setViewModel = ProfileListLearnerIdItemBinding::setViewModel,
-        transformViewModel = { it as ProfileLearnerIdItemViewModel }
-      )
-      .registerViewDataBinder(
-        viewType = ProfileListItemViewType.SYNC_STATUS,
-        inflateDataBinding = ProfileListSyncStatusItemBinding::inflate,
-        setViewModel = ProfileListSyncStatusItemBinding::setViewModel,
-        transformViewModel = { it as SyncStatusItemViewModel }
-      )
-      .build()
+    }.registerViewDataBinder(
+      viewType = ProfileListItemViewType.DEVICE_ID,
+      inflateDataBinding = ProfileListDeviceIdItemBinding::inflate,
+      setViewModel = ProfileListDeviceIdItemBinding::setViewModel,
+      transformViewModel = { it as DeviceIdItemViewModel }
+    ).registerViewDataBinder(
+      viewType = ProfileListItemViewType.LEARNER_ID,
+      inflateDataBinding = ProfileListLearnerIdItemBinding::inflate,
+      setViewModel = ProfileListLearnerIdItemBinding::setViewModel,
+      transformViewModel = { it as ProfileLearnerIdItemViewModel }
+    ).registerViewDataBinder(
+      viewType = ProfileListItemViewType.SYNC_STATUS,
+      inflateDataBinding = ProfileListSyncStatusItemBinding::inflate,
+      setViewModel = ProfileListSyncStatusItemBinding::setViewModel,
+      transformViewModel = { it as SyncStatusItemViewModel }
+    ).registerViewDataBinder(
+      viewType = ProfileListItemViewType.SHARE_IDS,
+      inflateDataBinding = ProfileListShareIdsItemBinding::inflate,
+      setViewModel = ProfileListShareIdsItemBinding::setViewModel,
+      transformViewModel = { it as ShareIdsViewModel }
+    ).build()
   }
 }
diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileListViewModel.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileListViewModel.kt
index 895cb20d696..ff3778b85d8 100644
--- a/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileListViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileListViewModel.kt
@@ -23,20 +23,18 @@ class ProfileListViewModel private constructor(
   private val oppiaLogger: OppiaLogger,
   private val deviceIdItemViewModelFactory: DeviceIdItemViewModel.Factory,
   private val syncStatusItemViewModelFactory: SyncStatusItemViewModel.Factory,
-  private val profileLearnerIdItemViewModelFactory: ProfileLearnerIdItemViewModel.Factory
+  private val profileLearnerIdItemViewModelFactory: ProfileLearnerIdItemViewModel.Factory,
+  private val shareIdsViewModelFactory: ShareIdsViewModel.Factory
 ) : ObservableViewModel() {
   /** The list of [ProfileListItemViewModel] to display. */
   val profileModels: LiveData<List<ProfileListItemViewModel>> by lazy {
-    Transformations.map(
-      profileManagementController.getProfiles().toLiveData(), ::processProfiles
-    )
+    Transformations.map(profileManagementController.getProfiles().toLiveData(), ::processProfiles)
   }
 
   private fun processProfiles(
     profilesResult: AsyncResult<List<Profile>>
   ): List<ProfileListItemViewModel> {
     val deviceIdViewModel = deviceIdItemViewModelFactory.create()
-    val syncStatusViewModel = syncStatusItemViewModelFactory.create()
 
     val learnerIdModels = when (profilesResult) {
       is AsyncResult.Pending -> listOf()
@@ -56,7 +54,10 @@ class ProfileListViewModel private constructor(
       }
     }
 
-    return listOf(deviceIdViewModel) + learnerIdModels + listOf(syncStatusViewModel)
+    val idModels = listOf(deviceIdViewModel) + learnerIdModels
+    val shareIdsViewModel = shareIdsViewModelFactory.create(idModels)
+    val syncStatusViewModel = syncStatusItemViewModelFactory.create()
+    return idModels + listOf(syncStatusViewModel, shareIdsViewModel)
   }
 
   /**
@@ -80,7 +81,10 @@ class ProfileListViewModel private constructor(
     LEARNER_ID,
 
     /** Corresponds to [SyncStatusItemViewModel]. */
-    SYNC_STATUS
+    SYNC_STATUS,
+
+    /** Corresponds to [ShareIdsViewModel]. */
+    SHARE_IDS
   }
 
   /** Factory to create new [ProfileListViewModel]s. */
@@ -89,7 +93,8 @@ class ProfileListViewModel private constructor(
     private val oppiaLogger: OppiaLogger,
     private val deviceIdItemViewModelFactory: DeviceIdItemViewModel.Factory,
     private val syncStatusItemViewModelFactory: SyncStatusItemViewModel.Factory,
-    private val profileLearnerIdItemViewModelFactory: ProfileLearnerIdItemViewModel.Factory
+    private val profileLearnerIdItemViewModelFactory: ProfileLearnerIdItemViewModel.Factory,
+    private val shareIdsViewModelFactory: ShareIdsViewModel.Factory
   ) {
     /** Returns a new [ProfileListViewModel]. */
     fun create(): ProfileListViewModel {
@@ -98,7 +103,8 @@ class ProfileListViewModel private constructor(
         oppiaLogger,
         deviceIdItemViewModelFactory,
         syncStatusItemViewModelFactory,
-        profileLearnerIdItemViewModelFactory
+        profileLearnerIdItemViewModelFactory,
+        shareIdsViewModelFactory
       )
     }
   }
diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ShareIdsViewModel.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ShareIdsViewModel.kt
new file mode 100644
index 00000000000..435315c705c
--- /dev/null
+++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ShareIdsViewModel.kt
@@ -0,0 +1,58 @@
+package org.oppia.android.app.administratorcontrols.learneranalytics
+
+import android.annotation.SuppressLint
+import android.content.ActivityNotFoundException
+import android.content.Intent
+import androidx.appcompat.app.AppCompatActivity
+import org.oppia.android.app.administratorcontrols.learneranalytics.ProfileListViewModel.ProfileListItemViewModel
+import org.oppia.android.domain.oppialogger.OppiaLogger
+import javax.inject.Inject
+
+/**
+ * [ProfileListItemViewModel] that represents the portion of the learner analytics admin page which
+ * provides a button to the user that allows them to share the device's installation ID, along with
+ * profile IDs, to an external app for record keeping.
+ */
+@SuppressLint("StaticFieldLeak") // False positive (Android doesn't manage this model's lifecycle).
+class ShareIdsViewModel private constructor(
+  private val oppiaLogger: OppiaLogger,
+  private val activity: AppCompatActivity,
+  private val viewModels: List<ProfileListItemViewModel>
+) : ProfileListItemViewModel(ProfileListViewModel.ProfileListItemViewType.SHARE_IDS) {
+  /** Indicates the user wants to share learner & the device IDs with another app. */
+  fun onShareIdsButtonClicked() {
+    // Reference: https://developer.android.com/guide/components/intents-common#Email from
+    // https://stackoverflow.com/a/15022153/3689782.
+    val sharedText = viewModels.mapNotNull { viewModel ->
+      when (viewModel) {
+        is DeviceIdItemViewModel -> "Oppia app installation ID: ${viewModel.deviceId.value}"
+        is ProfileLearnerIdItemViewModel -> {
+          val profile = viewModel.profile
+          "- Profile name: ${profile.name}, learner ID: ${profile.learnerId}"
+        }
+        else -> null
+      }
+    }.joinToString(separator = "\n")
+    try {
+      activity.startActivity(
+        Intent(Intent.ACTION_SEND).apply {
+          type = "text/plain"
+          addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+          putExtra(Intent.EXTRA_TEXT, sharedText)
+        }
+      )
+    } catch (e: ActivityNotFoundException) {
+      oppiaLogger.e("ProfileAndDeviceIdViewModel", "No activity found to receive shared IDs.", e)
+    }
+  }
+
+  /** Factory for creating new [ShareIdsViewModel]s. */
+  class Factory @Inject constructor(
+    private val oppiaLogger: OppiaLogger,
+    private val activity: AppCompatActivity
+  ) {
+    /** Returns a new [ShareIdsViewModel]. */
+    fun create(viewModels: List<ProfileListItemViewModel>): ShareIdsViewModel =
+      ShareIdsViewModel(oppiaLogger, activity, viewModels)
+  }
+}
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 ae37501e728..eedc0483a0b 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
@@ -13,6 +13,7 @@ import org.oppia.android.app.home.promotedlist.ComingSoonTopicListViewModel
 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.ProfileId
 import org.oppia.android.app.model.TopicSummary
 import org.oppia.android.app.recyclerview.BindableAdapter
 import org.oppia.android.app.translation.AppLanguageResourceHandler
@@ -24,6 +25,7 @@ import org.oppia.android.databinding.PromotedStoryListBinding
 import org.oppia.android.databinding.TopicSummaryViewBinding
 import org.oppia.android.databinding.WelcomeBinding
 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
@@ -39,6 +41,7 @@ class HomeFragmentPresenter @Inject constructor(
   private val profileManagementController: ProfileManagementController,
   private val topicListController: TopicListController,
   private val oppiaLogger: OppiaLogger,
+  private val analyticsController: AnalyticsController,
   @TopicHtmlParserEntityType private val topicEntityType: String,
   @StoryHtmlParserEntityType private val storyEntityType: String,
   private val resourceHandler: AppLanguageResourceHandler,
@@ -157,6 +160,9 @@ class HomeFragmentPresenter @Inject constructor(
   }
 
   private fun logHomeActivityEvent() {
-    oppiaLogger.logImportantEvent(oppiaLogger.createOpenHomeContext())
+    analyticsController.logImportantEvent(
+      oppiaLogger.createOpenHomeContext(),
+      ProfileId.newBuilder().apply { internalId = internalProfileId }.build()
+    )
   }
 }
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 a28f18c0664..8796b96b672 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
@@ -11,6 +11,7 @@ import androidx.fragment.app.Fragment
 import org.oppia.android.R
 import org.oppia.android.app.fragment.FragmentScope
 import org.oppia.android.app.model.ExplorationFragmentArguments
+import org.oppia.android.app.model.ProfileId
 import org.oppia.android.app.model.ReadingTextSize
 import org.oppia.android.app.model.Spotlight
 import org.oppia.android.app.player.state.StateFragment
@@ -21,6 +22,7 @@ import org.oppia.android.app.translation.AppLanguageResourceHandler
 import org.oppia.android.app.utility.FontScaleConfigurationUtil
 import org.oppia.android.databinding.ExplorationFragmentBinding
 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.util.data.AsyncResult
 import org.oppia.android.util.data.DataProviders.Companion.toLiveData
@@ -33,6 +35,7 @@ import javax.inject.Inject
 class ExplorationFragmentPresenter @Inject constructor(
   private val fragment: Fragment,
   private val oppiaLogger: OppiaLogger,
+  private val analyticsController: AnalyticsController,
   private val fontScaleConfigurationUtil: FontScaleConfigurationUtil,
   private val profileManagementController: ProfileManagementController,
   private val resourceHandler: AppLanguageResourceHandler
@@ -144,8 +147,9 @@ class ExplorationFragmentPresenter @Inject constructor(
   }
 
   private fun logPracticeFragmentEvent(topicId: String, storyId: String, explorationId: String) {
-    oppiaLogger.logImportantEvent(
-      oppiaLogger.createOpenExplorationActivityContext(topicId, storyId, explorationId)
+    analyticsController.logImportantEvent(
+      oppiaLogger.createOpenExplorationActivityContext(topicId, storyId, explorationId),
+      ProfileId.newBuilder().apply { internalId = internalProfileId }.build()
     )
   }
 
diff --git a/app/src/main/java/org/oppia/android/app/player/state/StateViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/StateViewModel.kt
index c41e987c35d..b180c0e61d7 100644
--- a/app/src/main/java/org/oppia/android/app/player/state/StateViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/player/state/StateViewModel.kt
@@ -10,6 +10,7 @@ import androidx.lifecycle.ViewModel
 import org.oppia.android.app.fragment.FragmentScope
 import org.oppia.android.app.model.EphemeralState
 import org.oppia.android.app.model.OppiaLanguage
+import org.oppia.android.app.model.Profile
 import org.oppia.android.app.model.ProfileId
 import org.oppia.android.app.model.UserAnswer
 import org.oppia.android.app.model.WrittenTranslationLanguageSelection
@@ -20,6 +21,7 @@ import org.oppia.android.app.viewmodel.ObservableArrayList
 import org.oppia.android.app.viewmodel.ObservableViewModel
 import org.oppia.android.domain.exploration.ExplorationProgressController
 import org.oppia.android.domain.oppialogger.OppiaLogger
+import org.oppia.android.domain.profile.ProfileManagementController
 import org.oppia.android.domain.translation.TranslationController
 import org.oppia.android.util.data.AsyncResult
 import org.oppia.android.util.data.DataProviders.Companion.toLiveData
@@ -36,6 +38,7 @@ class StateViewModel @Inject constructor(
   private val machineLocale: OppiaLocale.MachineLocale,
   private val oppiaLogger: OppiaLogger,
   private val fragment: Fragment,
+  private val profileManagementController: ProfileManagementController,
   @EnableLearnerStudyAnalytics private val enableLearnerStudy: PlatformParameterValue<Boolean>
 ) : ObservableViewModel() {
   val itemList: ObservableList<StateItemViewModel> = ObservableArrayList()
@@ -63,6 +66,13 @@ class StateViewModel @Inject constructor(
     )
   }
 
+  val allowInLessonQuickLanguageSwitching: LiveData<Boolean> by lazy {
+    Transformations.map(
+      profileManagementController.getProfile(profileId).toLiveData(),
+      ::processAllowInLessonQuickLanguageSwitching
+    )
+  }
+
   var currentStateName = ObservableField<String>(null as? String?)
 
   private val canSubmitAnswer = ObservableField(false)
@@ -98,13 +108,16 @@ class StateViewModel @Inject constructor(
     ) ?: UserAnswer.getDefaultInstance()
   }
 
-  fun canQuicklyToggleBetweenSwahiliAndEnglish(hasSwahiliTranslations: Boolean): Boolean {
+  fun canQuicklyToggleBetweenSwahiliAndEnglish(
+    hasSwahiliTranslations: Boolean,
+    allowInLessonLangSwitching: Boolean
+  ): Boolean {
     // This logic has to be done in Kotlin since there seems to be a bug in the generated Java by
     // the databinding compiler that can result in a NPE being thrown in code that shouldn't
     // actually be throwing it (see https://issuetracker.google.com/issues/144246528 for context).
     // Essentially, the following example of generated code results in an NPE unexpectedly:
     //   Boolean value = boolean_value ? Boolean_value : false (Boolean_value can be null)
-    return hasSwahiliTranslations && hasSupportForSwitchingToSwahili
+    return hasSwahiliTranslations && hasSupportForSwitchingToSwahili && allowInLessonLangSwitching
   }
 
   fun toggleContentLanguage(isSwahiliEnabled: Boolean) {
@@ -112,7 +125,9 @@ class StateViewModel @Inject constructor(
       selectedLanguage = if (isSwahiliEnabled) OppiaLanguage.ENGLISH else OppiaLanguage.SWAHILI
     }.build()
     val updateResultProvider =
-      translationController.updateWrittenTranslationContentLanguage(profileId, languageSelection)
+      explorationProgressController.updateWrittenTranslationContentLanguageMidLesson(
+        profileId, languageSelection
+      )
     val updateResultLiveData = updateResultProvider.toLiveData()
     updateResultLiveData.observe(
       fragment,
@@ -165,20 +180,36 @@ class StateViewModel @Inject constructor(
     }
   }
 
+  private fun processAllowInLessonQuickLanguageSwitching(
+    profileResult: AsyncResult<Profile>
+  ): Boolean {
+    return when (profileResult) {
+      is AsyncResult.Pending -> false // Assume the setting is off until verified.
+      is AsyncResult.Success -> profileResult.value.allowInLessonQuickLanguageSwitching
+      is AsyncResult.Failure -> {
+        oppiaLogger.e(
+          "StateViewModel",
+          "Failed to retrieve profile for current ID: $profileId.",
+          profileResult.error
+        )
+        false // Assume the setting is off since a retrieval error occurred.
+      }
+    }
+  }
+
   private fun processWhetherSwahiliIsSupported(stateResult: AsyncResult<EphemeralState>): Boolean {
     return when (stateResult) {
       is AsyncResult.Pending -> false
       is AsyncResult.Success -> {
         // It would be nice if there was a domain utility to do this if it's needed elsewhere (or,
-        // better yet, just using the language protos directly in the state structure so no raw language codes need to be processed).
-        val supportedLanguageCodes = stateResult.value.state.writtenTranslationsMap.values.flatMap {
-          it.translationMappingMap.keys
-        }.toSet()
-        supportedLanguageCodes.any {
-          machineLocale.run {
-            it.toMachineLowerCase() == "sw"
-          }
-        }
+        // better yet, just using the language protos directly in the state structure so no raw
+        // language codes need to be processed).
+        val state = stateResult.value.state
+        state.writtenTranslationsMap[state.content.contentId]?.translationMappingMap?.keys?.any {
+          // Only enable in-lesson language switching if the main content of a state is available in
+          // Swahili.
+          machineLocale.run { it.toMachineLowerCase() == "sw" }
+        } ?: false
       }
       is AsyncResult.Failure -> {
         oppiaLogger.e("StateViewModel", "Failed to retrieve state.", stateResult.error)
diff --git a/app/src/main/java/org/oppia/android/app/profile/ProfileChooserFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/profile/ProfileChooserFragmentPresenter.kt
index 1dfcbff875a..cb5eb337589 100644
--- a/app/src/main/java/org/oppia/android/app/profile/ProfileChooserFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/profile/ProfileChooserFragmentPresenter.kt
@@ -24,6 +24,7 @@ import org.oppia.android.databinding.ProfileChooserAddViewBinding
 import org.oppia.android.databinding.ProfileChooserFragmentBinding
 import org.oppia.android.databinding.ProfileChooserProfileViewBinding
 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.util.data.AsyncResult
 import org.oppia.android.util.data.DataProviders.Companion.toLiveData
@@ -66,6 +67,7 @@ class ProfileChooserFragmentPresenter @Inject constructor(
   private val viewModelProvider: ViewModelProvider<ProfileChooserViewModel>,
   private val profileManagementController: ProfileManagementController,
   private val oppiaLogger: OppiaLogger,
+  private val analyticsController: AnalyticsController,
   private val multiTypeBuilderFactory: BindableAdapter.MultiTypeBuilder.Factory
 ) {
   private lateinit var binding: ProfileChooserFragmentBinding
@@ -252,7 +254,10 @@ class ProfileChooserFragmentPresenter @Inject constructor(
   }
 
   private fun logProfileChooserEvent() {
-    oppiaLogger.logImportantEvent(oppiaLogger.createOpenProfileChooserContext())
+    analyticsController.logImportantEvent(
+      oppiaLogger.createOpenProfileChooserContext(),
+      profileId = null // There's no profile currently logged in.
+    )
   }
 
   private fun updateLearnerIdIfAbsent(profile: Profile) {
diff --git a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditFragmentPresenter.kt
index ff02e45b9ff..f1fb73492b1 100644
--- a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditFragmentPresenter.kt
@@ -87,38 +87,45 @@ class ProfileEditFragmentPresenter @Inject constructor(
       showDeletionDialog(internalProfileId)
     }
 
-    profileEditViewModel.profile.observe(
-      fragment,
-      Observer {
-        if (activity is ProfileEditActivity) {
-          activity.title = it.name
-        }
+    profileEditViewModel.profile.observe(fragment) { profile ->
+      if (activity is ProfileEditActivity) {
+        activity.title = profile.name
       }
-    )
 
-    profileEditViewModel.isAllowedDownloadAccess.observe(
-      fragment,
-      Observer {
-        binding.profileEditAllowDownloadSwitch.isChecked = it
-      }
-    )
+      binding.profileEditAllowDownloadSwitch.isChecked = profile.allowDownloadAccess
+      binding.profileEditEnableInLessonLanguageSwitchingSwitch.isChecked =
+        profile.allowInLessonQuickLanguageSwitching
+    }
 
     binding.profileEditAllowDownloadContainer.setOnClickListener {
-      binding.profileEditAllowDownloadSwitch.isChecked =
-        !binding.profileEditAllowDownloadSwitch.isChecked
+      val enableDownloads = !binding.profileEditAllowDownloadSwitch.isChecked
+      binding.profileEditAllowDownloadSwitch.isChecked = enableDownloads
       profileManagementController.updateAllowDownloadAccess(
         ProfileId.newBuilder().setInternalId(internalProfileId).build(),
-        binding.profileEditAllowDownloadSwitch.isChecked
-      ).toLiveData().observe(
-        activity,
-        Observer {
-          if (it is AsyncResult.Failure) {
-            oppiaLogger.e(
-              "ProfileEditActivityPresenter", "Failed to updated allow download access", it.error
-            )
-          }
+        enableDownloads
+      ).toLiveData().observe(activity) {
+        if (it is AsyncResult.Failure) {
+          oppiaLogger.e(
+            "ProfileEditActivityPresenter", "Failed to updated allow download access", it.error
+          )
         }
-      )
+      }
+    }
+    binding.profileEditEnableInLessonLanguageSwitchingContainer.setOnClickListener {
+      val enableLangSwitching = !binding.profileEditEnableInLessonLanguageSwitchingSwitch.isChecked
+      binding.profileEditEnableInLessonLanguageSwitchingSwitch.isChecked = enableLangSwitching
+      profileManagementController.updateEnableInLessonQuickLanguageSwitching(
+        ProfileId.newBuilder().setInternalId(internalProfileId).build(),
+        enableLangSwitching
+      ).toLiveData().observe(activity) {
+        if (it is AsyncResult.Failure) {
+          oppiaLogger.e(
+            "ProfileEditActivityPresenter",
+            "Failed to updated allow quick language switching",
+            it.error
+          )
+        }
+      }
     }
     return binding.root
   }
diff --git a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditViewModel.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditViewModel.kt
index d7228774fae..8aa02c1d428 100644
--- a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditViewModel.kt
@@ -1,7 +1,6 @@
 package org.oppia.android.app.settings.profile
 
 import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Transformations
 import org.oppia.android.app.fragment.FragmentScope
 import org.oppia.android.app.model.Profile
@@ -26,14 +25,12 @@ class ProfileEditViewModel @Inject constructor(
 ) : ObservableViewModel() {
   private lateinit var profileId: ProfileId
 
-  private val isAllowedDownloadAccessMutableLiveData = MutableLiveData<Boolean>()
-
-  /** Download access enabled for the profile by the administrator. */
-  val isAllowedDownloadAccess: LiveData<Boolean> = isAllowedDownloadAccessMutableLiveData
-
   /** Whether the admin is allowed to mark chapters as finished. */
   val isAllowedToMarkFinishedChapters: Boolean = enableLearnerStudy.value
 
+  /** Whether the admin can allow learners to quickly switch content languages within a lesson. */
+  val isAllowedToEnableQuickLessonLanguageSwitching: Boolean = enableLearnerStudy.value
+
   /** List of all the current profiles registered in the app [ProfileListFragment]. */
   val profile: LiveData<Profile> by lazy {
     Transformations.map(
@@ -71,7 +68,6 @@ class ProfileEditViewModel @Inject constructor(
       is AsyncResult.Pending -> Profile.getDefaultInstance()
       is AsyncResult.Success -> profileResult.value
     }
-    isAllowedDownloadAccessMutableLiveData.value = profile.allowDownloadAccess
     isAdmin = profile.isAdmin
     return profile
   }
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 7958dfcc8b0..7ec6ce8317d 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
@@ -35,6 +35,7 @@ import org.oppia.android.databinding.StoryFragmentBinding
 import org.oppia.android.databinding.StoryHeaderViewBinding
 import org.oppia.android.domain.exploration.ExplorationDataController
 import org.oppia.android.domain.oppialogger.OppiaLogger
+import org.oppia.android.domain.oppialogger.analytics.AnalyticsController
 import org.oppia.android.util.accessibility.AccessibilityService
 import org.oppia.android.util.data.AsyncResult
 import org.oppia.android.util.data.DataProviders.Companion.toLiveData
@@ -48,6 +49,7 @@ class StoryFragmentPresenter @Inject constructor(
   private val activity: AppCompatActivity,
   private val fragment: Fragment,
   private val oppiaLogger: OppiaLogger,
+  private val analyticsController: AnalyticsController,
   private val htmlParserFactory: HtmlParser.Factory,
   private val explorationDataController: ExplorationDataController,
   @DefaultResourceBucketName private val resourceBucketName: String,
@@ -61,12 +63,10 @@ class StoryFragmentPresenter @Inject constructor(
   private lateinit var binding: StoryFragmentBinding
   private lateinit var linearLayoutManager: LinearLayoutManager
   private lateinit var linearSmoothScroller: RecyclerView.SmoothScroller
+  private lateinit var profileId: ProfileId
 
-  @Inject
-  lateinit var storyViewModel: StoryViewModel
-
-  @Inject
-  lateinit var accessibilityService: AccessibilityService
+  @Inject lateinit var storyViewModel: StoryViewModel
+  @Inject lateinit var accessibilityService: AccessibilityService
 
   fun handleCreateView(
     inflater: LayoutInflater,
@@ -80,6 +80,7 @@ class StoryFragmentPresenter @Inject constructor(
       container,
       /* attachToRoot= */ false
     )
+    profileId = ProfileId.newBuilder().apply { internalId = internalProfileId }.build()
     storyViewModel.setInternalProfileId(internalProfileId)
     storyViewModel.setTopicId(topicId)
     storyViewModel.setStoryId(storyId)
@@ -255,7 +256,10 @@ class StoryFragmentPresenter @Inject constructor(
   }
 
   private fun logStoryActivityEvent(topicId: String, storyId: String) {
-    oppiaLogger.logImportantEvent(oppiaLogger.createOpenStoryActivityContext(topicId, storyId))
+    analyticsController.logImportantEvent(
+      oppiaLogger.createOpenStoryActivityContext(topicId, storyId),
+      profileId
+    )
   }
 
   private fun playExploration(
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 f04092a39b6..b94b7db6029 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
@@ -11,6 +11,7 @@ import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
 import org.oppia.android.R
 import org.oppia.android.app.fragment.FragmentScope
+import org.oppia.android.app.model.ProfileId
 import org.oppia.android.app.model.Spotlight
 import org.oppia.android.app.spotlight.SpotlightManager
 import org.oppia.android.app.spotlight.SpotlightShape
@@ -18,6 +19,7 @@ import org.oppia.android.app.spotlight.SpotlightTarget
 import org.oppia.android.app.translation.AppLanguageResourceHandler
 import org.oppia.android.databinding.TopicFragmentBinding
 import org.oppia.android.domain.oppialogger.OppiaLogger
+import org.oppia.android.domain.oppialogger.analytics.AnalyticsController
 import org.oppia.android.util.platformparameter.EnableExtraTopicTabsUi
 import org.oppia.android.util.platformparameter.PlatformParameterValue
 import javax.inject.Inject
@@ -29,6 +31,7 @@ class TopicFragmentPresenter @Inject constructor(
   private val fragment: Fragment,
   private val viewModel: TopicViewModel,
   private val oppiaLogger: OppiaLogger,
+  private val analyticsController: AnalyticsController,
   @EnableExtraTopicTabsUi private val enableExtraTopicTabsUi: PlatformParameterValue<Boolean>,
   private val resourceHandler: AppLanguageResourceHandler
 ) {
@@ -111,7 +114,6 @@ class TopicFragmentPresenter @Inject constructor(
 
   private fun setCurrentTab(tab: TopicTab) {
     viewPager.setCurrentItem(computeTabPosition(tab), true)
-    logTopicEvents(tab)
   }
 
   private fun computeTabPosition(tab: TopicTab): Int {
@@ -135,30 +137,22 @@ class TopicFragmentPresenter @Inject constructor(
         setCurrentTab(TopicTab.LESSONS)
       }
     }
+    viewPager2.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
+      override fun onPageSelected(position: Int) {
+        logTopicEvents(TopicTab.getTabForPosition(position, enableExtraTopicTabsUi.value))
+      }
+    })
   }
 
   private fun logTopicEvents(tab: TopicTab) {
-    when (tab) {
-      TopicTab.INFO -> logInfoFragmentEvent(topicId)
-      TopicTab.LESSONS -> logLessonsFragmentEvent(topicId)
-      TopicTab.PRACTICE -> logPracticeFragmentEvent(topicId)
-      TopicTab.REVISION -> logRevisionFragmentEvent(topicId)
+    val eventContext = when (tab) {
+      TopicTab.INFO -> oppiaLogger.createOpenInfoTabContext(topicId)
+      TopicTab.LESSONS -> oppiaLogger.createOpenLessonsTabContext(topicId)
+      TopicTab.PRACTICE -> oppiaLogger.createOpenPracticeTabContext(topicId)
+      TopicTab.REVISION -> oppiaLogger.createOpenRevisionTabContext(topicId)
     }
-  }
-
-  private fun logInfoFragmentEvent(topicId: String) {
-    oppiaLogger.logImportantEvent(oppiaLogger.createOpenInfoTabContext(topicId))
-  }
-
-  private fun logLessonsFragmentEvent(topicId: String) {
-    oppiaLogger.logImportantEvent(oppiaLogger.createOpenLessonsTabContext(topicId))
-  }
-
-  private fun logPracticeFragmentEvent(topicId: String) {
-    oppiaLogger.logImportantEvent(oppiaLogger.createOpenPracticeTabContext(topicId))
-  }
-
-  private fun logRevisionFragmentEvent(topicId: String) {
-    oppiaLogger.logImportantEvent(oppiaLogger.createOpenRevisionTabContext(topicId))
+    analyticsController.logImportantEvent(
+      eventContext, ProfileId.newBuilder().apply { internalId = internalProfileId }.build()
+    )
   }
 }
diff --git a/app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentPresenter.kt
index 16096768f19..be54a5e57af 100644
--- a/app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentPresenter.kt
@@ -11,6 +11,7 @@ import org.oppia.android.app.translation.AppLanguageResourceHandler
 import org.oppia.android.app.viewmodel.ViewModelProvider
 import org.oppia.android.databinding.ConceptCardFragmentBinding
 import org.oppia.android.domain.oppialogger.OppiaLogger
+import org.oppia.android.domain.oppialogger.analytics.AnalyticsController
 import org.oppia.android.domain.translation.TranslationController
 import org.oppia.android.util.gcsresource.DefaultResourceBucketName
 import org.oppia.android.util.parser.html.ConceptCardHtmlParserEntityType
@@ -22,6 +23,7 @@ import javax.inject.Inject
 class ConceptCardFragmentPresenter @Inject constructor(
   private val fragment: Fragment,
   private val oppiaLogger: OppiaLogger,
+  private val analyticsController: AnalyticsController,
   private val htmlParserFactory: HtmlParser.Factory,
   @ConceptCardHtmlParserEntityType private val entityType: String,
   @DefaultResourceBucketName private val resourceBucketName: String,
@@ -98,7 +100,9 @@ class ConceptCardFragmentPresenter @Inject constructor(
   }
 
   private fun logConceptCardEvent(skillId: String) {
-    oppiaLogger.logImportantEvent(oppiaLogger.createOpenConceptCardContext(skillId))
+    analyticsController.logImportantEvent(
+      oppiaLogger.createOpenConceptCardContext(skillId), profileId
+    )
   }
 
   override fun onConceptCardLinkClicked(view: View, skillId: String) {
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 596ee8287d8..a9d3ceb558e 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
@@ -30,6 +30,7 @@ import org.oppia.android.app.utility.SplitScreenManager
 import org.oppia.android.app.viewmodel.ViewModelProvider
 import org.oppia.android.databinding.QuestionPlayerFragmentBinding
 import org.oppia.android.domain.oppialogger.OppiaLogger
+import org.oppia.android.domain.oppialogger.analytics.AnalyticsController
 import org.oppia.android.domain.question.QuestionAssessmentProgressController
 import org.oppia.android.util.data.AsyncResult
 import org.oppia.android.util.data.DataProvider
@@ -45,6 +46,7 @@ class QuestionPlayerFragmentPresenter @Inject constructor(
   private val viewModelProvider: ViewModelProvider<QuestionPlayerViewModel>,
   private val questionAssessmentProgressController: QuestionAssessmentProgressController,
   private val oppiaLogger: OppiaLogger,
+  private val analyticsController: AnalyticsController,
   @QuestionResourceBucketName private val resourceBucketName: String,
   private val assemblerBuilderFactory: StatePlayerRecyclerViewAssembler.Builder.Factory,
   private val splitScreenManager: SplitScreenManager
@@ -64,6 +66,7 @@ class QuestionPlayerFragmentPresenter @Inject constructor(
   private lateinit var questionId: String
   private lateinit var currentQuestionState: State
   private lateinit var helpIndex: HelpIndex
+  private lateinit var profileId: ProfileId
 
   fun handleCreateView(
     inflater: LayoutInflater,
@@ -75,6 +78,7 @@ class QuestionPlayerFragmentPresenter @Inject constructor(
       container,
       /* attachToRoot= */ false
     )
+    this.profileId = profileId
 
     recyclerViewAssembler = createRecyclerViewAssembler(
       assemblerBuilderFactory.create(resourceBucketName, "skill", profileId),
@@ -354,8 +358,9 @@ class QuestionPlayerFragmentPresenter @Inject constructor(
   }
 
   private fun logQuestionPlayerEvent(questionId: String, skillIds: List<String>) {
-    oppiaLogger.logImportantEvent(
-      oppiaLogger.createOpenQuestionPlayerContext(questionId, skillIds)
+    analyticsController.logImportantEvent(
+      oppiaLogger.createOpenQuestionPlayerContext(questionId, skillIds),
+      profileId
     )
   }
 
diff --git a/app/src/main/java/org/oppia/android/app/topic/revisioncard/ReturnToTopicClickListener.kt b/app/src/main/java/org/oppia/android/app/topic/revisioncard/ReturnToTopicClickListener.kt
index 1477507296a..29401c9ef87 100644
--- a/app/src/main/java/org/oppia/android/app/topic/revisioncard/ReturnToTopicClickListener.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/revisioncard/ReturnToTopicClickListener.kt
@@ -1,6 +1,7 @@
 package org.oppia.android.app.topic.revisioncard
 
-/** Listener to route to [TopicActivity] when clicked on Return to Topic button. */
+/** Listener for when user wishes to navigate back from a revision card to the topic screen. */
 interface ReturnToTopicClickListener {
-  fun onReturnToTopicClicked()
+  /** Indicates that the user wishes to return to the topic screen from a revision card. */
+  fun onReturnToTopicRequested()
 }
diff --git a/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivity.kt b/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivity.kt
index 27a94b1a706..627d85ce6b6 100644
--- a/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivity.kt
@@ -88,11 +88,16 @@ class RevisionCardActivity :
     this.finish()
   }
 
-  override fun onReturnToTopicClicked() {
-    onBackPressed()
+  override fun onReturnToTopicRequested() {
+    revisionCardActivityPresenter.logExitRevisionCard()
+    finish()
   }
 
   override fun dismissConceptCard() {
     revisionCardActivityPresenter.dismissConceptCard()
   }
+
+  override fun onBackPressed() {
+    onReturnToTopicRequested()
+  }
 }
diff --git a/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityPresenter.kt
index a307c330cbc..1cc5c331db5 100644
--- a/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityPresenter.kt
@@ -16,6 +16,7 @@ import org.oppia.android.app.options.OptionsActivity
 import org.oppia.android.app.player.exploration.BottomSheetOptionsMenu
 import org.oppia.android.databinding.RevisionCardActivityBinding
 import org.oppia.android.domain.oppialogger.OppiaLogger
+import org.oppia.android.domain.oppialogger.analytics.AnalyticsController
 import org.oppia.android.domain.topic.TopicController
 import org.oppia.android.domain.translation.TranslationController
 import org.oppia.android.util.data.AsyncResult
@@ -27,6 +28,7 @@ import javax.inject.Inject
 class RevisionCardActivityPresenter @Inject constructor(
   private val activity: AppCompatActivity,
   private val oppiaLogger: OppiaLogger,
+  private val analyticsController: AnalyticsController,
   private val topicController: TopicController,
   private val translationController: TranslationController
 ) {
@@ -62,7 +64,7 @@ class RevisionCardActivityPresenter @Inject constructor(
     activity.supportActionBar?.setDisplayShowTitleEnabled(false)
 
     binding.revisionCardToolbar.setNavigationOnClickListener {
-      (activity as RevisionCardActivity).finish()
+      (activity as ReturnToTopicClickListener).onReturnToTopicRequested()
     }
     binding.revisionCardToolbarTitle.setOnClickListener {
       binding.revisionCardToolbarTitle.isSelected = true
@@ -106,6 +108,13 @@ class RevisionCardActivityPresenter @Inject constructor(
   /** Dismisses the concept card fragment if it's currently active in this activity. */
   fun dismissConceptCard() = getReviewCardFragment()?.dismissConceptCard()
 
+  fun logExitRevisionCard() {
+    analyticsController.logImportantEvent(
+      oppiaLogger.createCloseRevisionCardContext(topicId, subtopicId),
+      profileId
+    )
+  }
+
   private fun subscribeToSubtopicTitle() {
     subtopicLiveData.observe(
       activity,
diff --git a/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardFragmentPresenter.kt
index 57931980e48..266645ae3fc 100755
--- a/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardFragmentPresenter.kt
@@ -11,6 +11,7 @@ import org.oppia.android.app.topic.conceptcard.ConceptCardFragment.Companion.CON
 import org.oppia.android.app.translation.AppLanguageResourceHandler
 import org.oppia.android.databinding.RevisionCardFragmentBinding
 import org.oppia.android.domain.oppialogger.OppiaLogger
+import org.oppia.android.domain.oppialogger.analytics.AnalyticsController
 import org.oppia.android.domain.translation.TranslationController
 import org.oppia.android.util.gcsresource.DefaultResourceBucketName
 import org.oppia.android.util.parser.html.HtmlParser
@@ -22,6 +23,7 @@ import javax.inject.Inject
 class RevisionCardFragmentPresenter @Inject constructor(
   private val fragment: Fragment,
   private val oppiaLogger: OppiaLogger,
+  private val analyticsController: AnalyticsController,
   private val htmlParserFactory: HtmlParser.Factory,
   @DefaultResourceBucketName private val resourceBucketName: String,
   @TopicHtmlParserEntityType private val entityType: String,
@@ -92,7 +94,10 @@ class RevisionCardFragmentPresenter @Inject constructor(
   }
 
   private fun logRevisionCardEvent(topicId: String, subTopicId: Int) {
-    oppiaLogger.logImportantEvent(oppiaLogger.createOpenRevisionCardContext(topicId, subTopicId))
+    analyticsController.logImportantEvent(
+      oppiaLogger.createOpenRevisionCardContext(topicId, subTopicId),
+      profileId
+    )
   }
 
   override fun onConceptCardLinkClicked(view: View, skillId: String) {
diff --git a/app/src/main/java/org/oppia/android/app/translation/BUILD.bazel b/app/src/main/java/org/oppia/android/app/translation/BUILD.bazel
index e5bc20b3d81..0e6bf561ab0 100644
--- a/app/src/main/java/org/oppia/android/app/translation/BUILD.bazel
+++ b/app/src/main/java/org/oppia/android/app/translation/BUILD.bazel
@@ -29,6 +29,7 @@ kt_android_library(
     deps = [
         ":app_language_locale_handler",
         ":dagger",
+        "//model/src/main/proto:profile_java_proto_lite",
         "//third_party:androidx_appcompat_appcompat",
         "//utility/src/main/java/org/oppia/android/util/locale:oppia_locale",
     ],
diff --git a/app/src/main/res/layout-land/profile_edit_fragment.xml b/app/src/main/res/layout-land/profile_edit_fragment.xml
index 725ff869a79..09ea627140b 100644
--- a/app/src/main/res/layout-land/profile_edit_fragment.xml
+++ b/app/src/main/res/layout-land/profile_edit_fragment.xml
@@ -131,6 +131,67 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/profile_reset_button" />
 
+      <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/profile_edit_enable_in_lesson_language_switching_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/general_item_background_border"
+        android:focusable="true"
+        android:importantForAccessibility="yes"
+        android:visibility="@{viewModel.isAllowedToEnableQuickLessonLanguageSwitching ? View.VISIBLE : View.GONE}"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/profile_mark_chapters_for_completion_button">
+
+        <TextView
+          android:id="@+id/profile_edit_enable_in_lesson_language_switching_header"
+          style="@style/TextViewStart"
+          android:layout_width="0dp"
+          android:layout_height="wrap_content"
+          android:fontFamily="sans-serif"
+          android:paddingStart="16dp"
+          android:paddingTop="12dp"
+          android:paddingEnd="24dp"
+          android:text="@string/profile_edit_enable_quick_lesson_language_switching_label"
+          android:textColor="@color/component_color_shared_primary_text_color"
+          android:textSize="16sp"
+          app:layout_constraintEnd_toStartOf="@+id/profile_edit_enable_in_lesson_language_switching_switch"
+          app:layout_constraintHorizontal_bias="0.0"
+          app:layout_constraintStart_toStartOf="parent"
+          app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+          android:id="@+id/profile_edit_enable_in_lesson_language_switching_label"
+          style="@style/TextViewStart"
+          android:layout_width="0dp"
+          android:layout_height="wrap_content"
+          android:fontFamily="sans-serif"
+          android:paddingStart="16dp"
+          android:paddingEnd="24dp"
+          android:paddingBottom="12dp"
+          android:text="@string/profile_edit_enable_quick_lesson_language_switching_explanation"
+          android:textColor="@color/component_color_shared_secondary_3_text_color"
+          android:textSize="14sp"
+          app:layout_constraintEnd_toStartOf="@+id/profile_edit_enable_in_lesson_language_switching_switch"
+          app:layout_constraintStart_toStartOf="parent"
+          app:layout_constraintTop_toBottomOf="@+id/profile_edit_enable_in_lesson_language_switching_header" />
+
+        <androidx.appcompat.widget.SwitchCompat
+          android:id="@+id/profile_edit_enable_in_lesson_language_switching_switch"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:clickable="false"
+          android:focusable="false"
+          android:minWidth="48dp"
+          android:minHeight="48dp"
+          android:paddingStart="12dp"
+          android:paddingTop="0dp"
+          android:paddingEnd="12dp"
+          android:theme="@style/OppiaSwitchCompatTheme"
+          app:layout_constraintEnd_toEndOf="parent"
+          app:layout_constraintTop_toTopOf="@+id/profile_edit_enable_in_lesson_language_switching_header" />
+      </androidx.constraintlayout.widget.ConstraintLayout>
+
       <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/profile_edit_allow_download_container"
         android:layout_width="match_parent"
@@ -141,7 +202,7 @@
         android:visibility="@{viewModel.showEditDownloadAccess ? View.VISIBLE : View.GONE}"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/profile_mark_chapters_for_completion_button">
+        app:layout_constraintTop_toBottomOf="@id/profile_edit_enable_in_lesson_language_switching_container">
 
         <TextView
           android:id="@+id/profile_edit_allow_download_heading"
diff --git a/app/src/main/res/layout/profile_edit_fragment.xml b/app/src/main/res/layout/profile_edit_fragment.xml
index 6a10daaf230..6bcf79c0286 100644
--- a/app/src/main/res/layout/profile_edit_fragment.xml
+++ b/app/src/main/res/layout/profile_edit_fragment.xml
@@ -135,6 +135,67 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/profile_reset_button" />
 
+      <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/profile_edit_enable_in_lesson_language_switching_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/general_item_background_border"
+        android:focusable="true"
+        android:importantForAccessibility="yes"
+        android:visibility="@{viewModel.isAllowedToEnableQuickLessonLanguageSwitching ? View.VISIBLE : View.GONE}"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/profile_mark_chapters_for_completion_button">
+
+        <TextView
+          android:id="@+id/profile_edit_enable_in_lesson_language_switching_header"
+          style="@style/TextViewStart"
+          android:layout_width="0dp"
+          android:layout_height="wrap_content"
+          android:fontFamily="sans-serif"
+          android:paddingStart="16dp"
+          android:paddingTop="12dp"
+          android:paddingEnd="24dp"
+          android:text="@string/profile_edit_enable_quick_lesson_language_switching_label"
+          android:textColor="@color/component_color_shared_primary_text_color"
+          android:textSize="16sp"
+          app:layout_constraintEnd_toStartOf="@+id/profile_edit_enable_in_lesson_language_switching_switch"
+          app:layout_constraintHorizontal_bias="0.0"
+          app:layout_constraintStart_toStartOf="parent"
+          app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+          android:id="@+id/profile_edit_enable_in_lesson_language_switching_label"
+          style="@style/TextViewStart"
+          android:layout_width="0dp"
+          android:layout_height="wrap_content"
+          android:fontFamily="sans-serif"
+          android:paddingStart="16dp"
+          android:paddingEnd="24dp"
+          android:paddingBottom="12dp"
+          android:text="@string/profile_edit_enable_quick_lesson_language_switching_explanation"
+          android:textColor="@color/component_color_shared_secondary_3_text_color"
+          android:textSize="14sp"
+          app:layout_constraintEnd_toStartOf="@+id/profile_edit_enable_in_lesson_language_switching_switch"
+          app:layout_constraintStart_toStartOf="parent"
+          app:layout_constraintTop_toBottomOf="@+id/profile_edit_enable_in_lesson_language_switching_header" />
+
+        <androidx.appcompat.widget.SwitchCompat
+          android:id="@+id/profile_edit_enable_in_lesson_language_switching_switch"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:clickable="false"
+          android:focusable="false"
+          android:minWidth="48dp"
+          android:minHeight="48dp"
+          android:paddingStart="12dp"
+          android:paddingTop="0dp"
+          android:paddingEnd="12dp"
+          android:theme="@style/OppiaSwitchCompatTheme"
+          app:layout_constraintEnd_toEndOf="parent"
+          app:layout_constraintTop_toTopOf="@+id/profile_edit_enable_in_lesson_language_switching_header" />
+      </androidx.constraintlayout.widget.ConstraintLayout>
+
       <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/profile_edit_allow_download_container"
         android:layout_width="match_parent"
@@ -145,7 +206,7 @@
         android:visibility="@{viewModel.showEditDownloadAccess ? View.VISIBLE : View.GONE}"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/profile_mark_chapters_for_completion_button">
+        app:layout_constraintTop_toBottomOf="@id/profile_edit_enable_in_lesson_language_switching_container">
 
         <TextView
           android:id="@+id/profile_edit_allow_download_heading"
diff --git a/app/src/main/res/layout/profile_list_share_ids_item.xml b/app/src/main/res/layout/profile_list_share_ids_item.xml
new file mode 100644
index 00000000000..709f9fda1d7
--- /dev/null
+++ b/app/src/main/res/layout/profile_list_share_ids_item.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <data>
+
+    <variable
+      name="viewModel"
+      type="org.oppia.android.app.administratorcontrols.learneranalytics.ShareIdsViewModel" />
+  </data>
+
+  <FrameLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="24dp"
+    android:layout_marginBottom="12dp">
+
+    <Button
+      style="@style/SecondaryButton"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_gravity="center"
+      android:minWidth="48dp"
+      android:minHeight="48dp"
+      android:onClick="@{() -> viewModel.onShareIdsButtonClicked()}"
+      android:text="@string/learner_analytics_share_ids_button_text" />
+  </FrameLayout>
+</layout>
diff --git a/app/src/main/res/layout/state_fragment.xml b/app/src/main/res/layout/state_fragment.xml
index d097ae065c6..06b50e9d13d 100755
--- a/app/src/main/res/layout/state_fragment.xml
+++ b/app/src/main/res/layout/state_fragment.xml
@@ -114,7 +114,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/animable_hints_and_solution_fragment_container"
         android:background="@color/color_palette_transparent_background_color"
-        android:visibility="@{viewModel.canQuicklyToggleBetweenSwahiliAndEnglish(viewModel.hasSwahiliTranslations) ? View.VISIBLE : View.GONE}">
+        android:visibility="@{viewModel.canQuicklyToggleBetweenSwahiliAndEnglish(viewModel.hasSwahiliTranslations, viewModel.allowInLessonQuickLanguageSwitching) ? View.VISIBLE : View.GONE}">
         <androidx.appcompat.widget.AppCompatButton
           android:id="@+id/quick_switch_exploration_language_button"
           android:layout_width="wrap_content"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index caf6982dc91..95a5a08dd6b 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -356,6 +356,8 @@
   <string name="profile_edit_rename">Rename</string>
   <string name="profile_edit_reset">Reset PIN</string>
   <string name="profile_edit_mark_chapter_completion">Mark Chapters Completed</string>
+  <string name="profile_edit_enable_quick_lesson_language_switching_label">Enable Quick Language Switching</string>
+  <string name="profile_edit_enable_quick_lesson_language_switching_explanation">Allow this user to quickly switch between English and Swahili within a lesson.</string>
   <string name="profile_edit_delete">Profile Deletion</string>
   <string name="profile_edit_delete_dialog_title">Permanently delete this profile?</string>
   <string name="profile_edit_delete_dialog_message">All progress will be deleted and cannot be recovered.</string>
diff --git a/app/src/main/res/values/untranslated_strings.xml b/app/src/main/res/values/untranslated_strings.xml
index 958d1e8d50f..5f28fd0cc41 100644
--- a/app/src/main/res/values/untranslated_strings.xml
+++ b/app/src/main/res/values/untranslated_strings.xml
@@ -83,8 +83,9 @@
   <string name="learner_analytics_sync_status_network_error" translatable="false">Please connect to a WiFi or Cellular network in order to upload profile data.</string>
   <string name="learner_analytics_device_id_clipboard_label_description" translatable="false">%s installation ID</string>
   <string name="learner_analytics_learner_id_clipboard_label_description" translatable="false">%s\'s learner ID</string>
+  <string name="learner_analytics_share_ids_button_text" translatable="false">Share IDs</string>
   <!-- Temporary learner strings. -->
-  <string name="temporary_translate_to_swahili" translatable="false">Switch lesson to Swahili</string>
+  <string name="temporary_translate_to_swahili" translatable="false">Badilisha lugha hadi Kiswahili</string>
   <string name="temporary_translate_to_english" translatable="false">Switch lesson to English</string>
   <!-- General test activity strings. -->
   <string name="test_activity_label" translatable="false">Test-only activity</string>
diff --git a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdFragmentTest.kt
index 182ec0cb8d9..0c0fb6d6c25 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdFragmentTest.kt
@@ -4,13 +4,22 @@ import android.app.Application
 import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
+import android.content.Intent
 import android.view.View
 import androidx.annotation.IdRes
 import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.RecyclerView
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.scrollTo
 import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition
+import androidx.test.espresso.intent.Intents
+import androidx.test.espresso.intent.Intents.intended
+import androidx.test.espresso.intent.matcher.IntentMatchers.hasAction
+import androidx.test.espresso.intent.matcher.IntentMatchers.hasExtra
+import androidx.test.espresso.intent.matcher.IntentMatchers.hasType
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.isRoot
 import androidx.test.espresso.matcher.ViewMatchers.withId
@@ -161,6 +170,7 @@ class ProfileAndDeviceIdFragmentTest {
     TestPlatformParameterModule.forceEnableEditAccountsOptionsUi(true)
     TestPlatformParameterModule.forceEnableLearnerStudyAnalytics(true)
     setUpTestApplicationComponent()
+    Intents.init()
     testCoroutineDispatchers.registerIdlingResource()
     profileTestHelper.addOnlyAdminProfile()
 
@@ -174,6 +184,7 @@ class ProfileAndDeviceIdFragmentTest {
   @After
   fun tearDown() {
     testCoroutineDispatchers.unregisterIdlingResource()
+    Intents.release()
   }
 
   @Test
@@ -181,7 +192,7 @@ class ProfileAndDeviceIdFragmentTest {
     initializeActivityAndAddFragment()
 
     // There should be three items: a header, a profile, and the sync status.
-    onView(withId(R.id.profile_and_device_id_recycler_view)).check(hasItemCount(count = 3))
+    onView(withId(R.id.profile_and_device_id_recycler_view)).check(hasItemCount(count = 4))
   }
 
   @Test
@@ -266,7 +277,7 @@ class ProfileAndDeviceIdFragmentTest {
     initializeActivityAndAddFragment()
 
     // Header + admin + 5 new profiles + sync status = 8 items.
-    onView(withId(R.id.profile_and_device_id_recycler_view)).check(hasItemCount(count = 8))
+    onView(withId(R.id.profile_and_device_id_recycler_view)).check(hasItemCount(count = 9))
   }
 
   @Test
@@ -385,7 +396,7 @@ class ProfileAndDeviceIdFragmentTest {
     onView(isRoot()).perform(orientationLandscape())
     testCoroutineDispatchers.runCurrent()
 
-    onView(withId(R.id.profile_and_device_id_recycler_view)).check(hasItemCount(count = 8))
+    onView(withId(R.id.profile_and_device_id_recycler_view)).check(hasItemCount(count = 9))
   }
 
   @Test
@@ -523,6 +534,32 @@ class ProfileAndDeviceIdFragmentTest {
       )
   }
 
+  @Test
+  fun testFragment_multipleProfiles_clickShareIds_sendsIntentWithIdsText() {
+    profileTestHelper.addMoreProfiles(numProfiles = 5)
+    initializeActivityAndAddFragment()
+
+    onView(withId(R.id.profile_and_device_id_recycler_view)).perform(
+      actionOnItemAtPosition<RecyclerView.ViewHolder>(8, scrollTo())
+    )
+    onView(withText(R.string.learner_analytics_share_ids_button_text)).perform(click())
+    testCoroutineDispatchers.runCurrent()
+
+    val expectedShareText =
+      """
+      Oppia app installation ID: c62db3c65fb1
+      - Profile name: Admin, learner ID: a9fe66ab
+      - Profile name: A, learner ID: c368b501
+      - Profile name: B, learner ID: 74facac7
+      - Profile name: C, learner ID: 413f22b0
+      - Profile name: D, learner ID: 63f83ba4
+      - Profile name: E, learner ID: 3772df24
+      """.trimIndent()
+    intended(hasAction(Intent.ACTION_SEND))
+    intended(hasType("text/plain"))
+    intended(hasExtra(Intent.EXTRA_TEXT, expectedShareText))
+  }
+
   private fun initializeActivityAndAddFragment() {
     activityRule.scenario.onActivity { activity ->
       activity.setContentView(R.layout.test_activity)
@@ -572,8 +609,9 @@ class ProfileAndDeviceIdFragmentTest {
 
   private fun queueAnalyticsEvent() {
     learnerAnalyticsLogger.logAppInForeground(
-      installationId = "test_install_id", learnerId = "test_learner_id"
+      installationId = "test_install_id", profileId = null, learnerId = "test_learner_id"
     )
+    testCoroutineDispatchers.runCurrent()
   }
 
   private fun flushEventWorkerQueue() {
diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/state/BUILD.bazel b/app/src/sharedTest/java/org/oppia/android/app/player/state/BUILD.bazel
index 3a85e75b6e7..8b340d5c065 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/player/state/BUILD.bazel
+++ b/app/src/sharedTest/java/org/oppia/android/app/player/state/BUILD.bazel
@@ -28,6 +28,7 @@ app_test(
         "//testing/src/main/java/org/oppia/android/testing/data:data_provider_test_monitor",
         "//testing/src/main/java/org/oppia/android/testing/espresso:edit_text_input_action",
         "//testing/src/main/java/org/oppia/android/testing/junit:initialize_default_locale_rule",
+        "//testing/src/main/java/org/oppia/android/testing/logging:event_log_subject",
         "//testing/src/main/java/org/oppia/android/testing/platformparameter:test_module",
         "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module",
         "//testing/src/main/java/org/oppia/android/testing/threading:coroutine_executor_service",
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 0f7816e357c..29f8ef025b8 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
@@ -134,6 +134,7 @@ import org.oppia.android.domain.oppialogger.analytics.CpuPerformanceSnapshotterM
 import org.oppia.android.domain.oppialogger.logscheduler.MetricLogSchedulerModule
 import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule
 import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule
+import org.oppia.android.domain.profile.ProfileManagementController
 import org.oppia.android.domain.question.QuestionModule
 import org.oppia.android.domain.topic.FRACTIONS_EXPLORATION_ID_1
 import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule
@@ -146,6 +147,7 @@ import org.oppia.android.domain.topic.TEST_TOPIC_ID_0
 import org.oppia.android.domain.translation.TranslationController
 import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule
 import org.oppia.android.testing.BuildEnvironment
+import org.oppia.android.testing.FakeAnalyticsEventLogger
 import org.oppia.android.testing.OppiaTestRule
 import org.oppia.android.testing.RunOn
 import org.oppia.android.testing.TestImageLoaderModule
@@ -156,6 +158,7 @@ import org.oppia.android.testing.environment.TestEnvironmentConfig
 import org.oppia.android.testing.espresso.EditTextInputAction
 import org.oppia.android.testing.junit.InitializeDefaultLocaleRule
 import org.oppia.android.testing.lightweightcheckpointing.ExplorationCheckpointTestHelper
+import org.oppia.android.testing.logging.EventLogSubject.Companion.assertThat
 import org.oppia.android.testing.platformparameter.TestPlatformParameterModule
 import org.oppia.android.testing.profile.ProfileTestHelper
 import org.oppia.android.testing.robolectric.IsOnRobolectric
@@ -197,39 +200,20 @@ import javax.inject.Singleton
 // SameParameterValue: tests should have specific context included/excluded for readability.
 @Suppress("FunctionName", "SameParameterValue")
 class StateFragmentTest {
-  @get:Rule
-  val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
-
-  @get:Rule
-  val oppiaTestRule = OppiaTestRule()
-
-  @Inject
-  lateinit var profileTestHelper: ProfileTestHelper
-
-  @Inject
-  lateinit var context: Context
-
-  @Inject
-  lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
-
-  @Inject
-  lateinit var editTextInputAction: EditTextInputAction
-
-  @Inject
-  @field:BackgroundDispatcher
-  lateinit var backgroundCoroutineDispatcher: CoroutineDispatcher
-
-  @Inject
-  lateinit var explorationCheckpointTestHelper: ExplorationCheckpointTestHelper
-
-  @Inject
-  lateinit var translationController: TranslationController
-
-  @Inject
-  lateinit var monitorFactory: DataProviderTestMonitor.Factory
-
-  @Inject
-  lateinit var testGlideImageLoader: TestGlideImageLoader
+  @get:Rule val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
+  @get:Rule val oppiaTestRule = OppiaTestRule()
+
+  @Inject lateinit var profileTestHelper: ProfileTestHelper
+  @Inject lateinit var context: Context
+  @Inject lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
+  @Inject lateinit var editTextInputAction: EditTextInputAction
+  @field:[Inject BackgroundDispatcher] lateinit var backgroundDispatcher: CoroutineDispatcher
+  @Inject lateinit var explorationCheckpointTestHelper: ExplorationCheckpointTestHelper
+  @Inject lateinit var translationController: TranslationController
+  @Inject lateinit var monitorFactory: DataProviderTestMonitor.Factory
+  @Inject lateinit var testGlideImageLoader: TestGlideImageLoader
+  @Inject lateinit var profileManagementController: ProfileManagementController
+  @Inject lateinit var fakeAnalyticsEventLogger: FakeAnalyticsEventLogger
 
   private val profileId = ProfileId.newBuilder().apply { internalId = 1 }.build()
 
@@ -2395,7 +2379,7 @@ class StateFragmentTest {
 
   // TODO(#3858): Enable for Espresso.
   @Test
-  @RunOn(TestPlatform.ROBOLECTRIC, buildEnvironments = [BuildEnvironment.BAZEL])
+  @RunOn(TestPlatform.ESPRESSO, buildEnvironments = [BuildEnvironment.BAZEL])
   fun testStateFragment_portuguese_dragAndDrop_optionsAreInPortuguese() {
     setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = true).use {
@@ -2504,7 +2488,6 @@ class StateFragmentTest {
     }
   }
 
-  // TODO(#1612): Enable for Robolectric.
   @Test
   @RunOn(buildEnvironments = [BuildEnvironment.BAZEL])
   fun testStateFragment_studyOff_inEnglish_doesNotHaveSwitchToSwahiliButton() {
@@ -2518,7 +2501,6 @@ class StateFragmentTest {
     }
   }
 
-  // TODO(#1612): Enable for Robolectric.
   @Test
   @RunOn(buildEnvironments = [BuildEnvironment.BAZEL])
   fun testStateFragment_studyOn_inEnglish_lessonWithoutSwahili_doesNotHaveSwitchToSwahiliButton() {
@@ -2533,28 +2515,42 @@ class StateFragmentTest {
     }
   }
 
-  // TODO(#1612): Enable for Robolectric.
   @Test
   @RunOn(buildEnvironments = [BuildEnvironment.BAZEL])
-  fun testStateFragment_studyOn_inEnglish_hasSwitchToSwahiliButton() {
+  fun testStateFragment_studyOn_inEnglish_notEnabledForProfile_doesNotHaveSwitchToSwahiliButton() {
     setUpTestWithStudyOn()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
 
+      // Verify that the "switch to Swahili" button is gone since the profile hasn't been allowed to
+      // switch languages quickly in-lesson.
+      onView(withId(R.id.quick_switch_exploration_language_button_container))
+        .check(matches(withEffectiveVisibility(GONE)))
+    }
+  }
+
+  @Test
+  @RunOn(buildEnvironments = [BuildEnvironment.BAZEL])
+  fun testStateFragment_studyOn_enabledForProfile_inEnglish_hasSwitchToSwahiliButton() {
+    setUpTestWithStudyOn()
+    enableInLessonLanguageSwitching()
+    launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
+      startPlayingExploration()
+
       // Verify that the "switch to Swahili" button is visible since the study is on & there are
       // Swahili translations in the loaded exploration.
       onView(withId(R.id.quick_switch_exploration_language_button_container))
         .check(matches(isDisplayed()))
       onView(withId(R.id.quick_switch_exploration_language_button))
-        .check(matches(withText("Switch lesson to Swahili")))
+        .check(matches(withText("Badilisha lugha hadi Kiswahili")))
     }
   }
 
-  // TODO(#1612): Enable for Robolectric.
   @Test
   @RunOn(buildEnvironments = [BuildEnvironment.BAZEL])
-  fun testStateFragment_studyOn_inSwahili_hasSwitchToEnglishButton() {
+  fun testStateFragment_studyOn_enabledForProfile_inSwahili_hasSwitchToEnglishButton() {
     setUpTestWithStudyOn()
+    enableInLessonLanguageSwitching()
     updateContentLanguage(profileId, OppiaLanguage.SWAHILI)
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
@@ -2572,6 +2568,7 @@ class StateFragmentTest {
   @RunOn(TestPlatform.ESPRESSO, buildEnvironments = [BuildEnvironment.BAZEL])
   fun testStateFragment_inEnglish_clickSwitchToSwahili_contentIsInSwahili() {
     setUpTestWithStudyOn()
+    enableInLessonLanguageSwitching()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
 
@@ -2590,6 +2587,7 @@ class StateFragmentTest {
   @RunOn(TestPlatform.ESPRESSO, buildEnvironments = [BuildEnvironment.BAZEL])
   fun testStateFragment_inSwahili_clickSwitchToEnglish_contentIsInEnglish() {
     setUpTestWithStudyOn()
+    enableInLessonLanguageSwitching()
     updateContentLanguage(profileId, OppiaLanguage.SWAHILI)
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
@@ -2599,7 +2597,7 @@ class StateFragmentTest {
 
       // Switching the language to English should result in both the button & text being updated.
       onView(withId(R.id.quick_switch_exploration_language_button))
-        .check(matches(withText("Switch lesson to Swahili")))
+        .check(matches(withText("Badilisha lugha hadi Kiswahili")))
       verifyContentContains("What fraction represents half of something?")
     }
   }
@@ -2609,6 +2607,7 @@ class StateFragmentTest {
   @RunOn(TestPlatform.ESPRESSO, buildEnvironments = [BuildEnvironment.BAZEL])
   fun testStateFragment_inEnglish_clickSwitchToSwahili_thenBackToEnglish_contentIsInEnglish() {
     setUpTestWithStudyOn()
+    enableInLessonLanguageSwitching()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
 
@@ -2620,11 +2619,55 @@ class StateFragmentTest {
 
       // Switching from English to Swahili, then back, should result in content being in English.
       onView(withId(R.id.quick_switch_exploration_language_button))
-        .check(matches(withText("Switch lesson to Swahili")))
+        .check(matches(withText("Badilisha lugha hadi Kiswahili")))
       verifyContentContains("What fraction represents half of something?")
     }
   }
 
+  @Test
+  @RunOn(buildEnvironments = [BuildEnvironment.BAZEL])
+  fun testStateFragment_inEnglish_clickSwitchToSwahili_logsSwitchLanguageEvent() {
+    setUpTestWithStudyOn()
+    enableInLessonLanguageSwitching()
+    updateContentLanguage(profileId, OppiaLanguage.ENGLISH)
+    launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
+      startPlayingExploration()
+
+      // Switch to Swahili.
+      onView(withId(R.id.quick_switch_exploration_language_button)).perform(click())
+      testCoroutineDispatchers.runCurrent()
+
+      // Verify that the "switch language" event was logged, and with the correct values.
+      val event = fakeAnalyticsEventLogger.getMostRecentEvent()
+      assertThat(event).hasSwitchInLessonLanguageContextThat {
+        hasSwitchFromLanguageThat().isEqualTo(OppiaLanguage.ENGLISH)
+        hasSwitchToLanguageThat().isEqualTo(OppiaLanguage.SWAHILI)
+      }
+    }
+  }
+
+  @Test
+  @RunOn(buildEnvironments = [BuildEnvironment.BAZEL])
+  fun testStateFragment_inSwahili_clickSwitchToEnglish_logsSwitchLanguageEvent() {
+    setUpTestWithStudyOn()
+    enableInLessonLanguageSwitching()
+    updateContentLanguage(profileId, OppiaLanguage.SWAHILI)
+    launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
+      startPlayingExploration()
+
+      // Switch to English.
+      onView(withId(R.id.quick_switch_exploration_language_button)).perform(click())
+      testCoroutineDispatchers.runCurrent()
+
+      // Verify that the "switch language" event was logged, and with the correct values.
+      val event = fakeAnalyticsEventLogger.getMostRecentEvent()
+      assertThat(event).hasSwitchInLessonLanguageContextThat {
+        hasSwitchFromLanguageThat().isEqualTo(OppiaLanguage.SWAHILI)
+        hasSwitchToLanguageThat().isEqualTo(OppiaLanguage.ENGLISH)
+      }
+    }
+  }
+
   @Test
   fun testStateFragment_mathInteractions_numericExp_matchesExactly_canSubmitCorrectAnswer() {
     setUpTestWithStudyOff()
@@ -4360,6 +4403,13 @@ class StateFragmentTest {
     monitorFactory.waitForNextSuccessfulResult(updateProvider)
   }
 
+  private fun enableInLessonLanguageSwitching() {
+    val updateProvider = profileManagementController.updateEnableInLessonQuickLanguageSwitching(
+      profileId, allowInLessonQuickLanguageSwitching = true
+    )
+    monitorFactory.ensureDataProviderExecutes(updateProvider)
+  }
+
   private fun verifyContentContains(expectedHtml: String) {
     scrollToViewType(CONTENT)
     onView(
@@ -4444,7 +4494,7 @@ class StateFragmentTest {
     // rest of Oppia so that thread execution can be synchronized via Oppia's test coroutine
     // dispatchers.
     val executorService = MockGlideExecutor.newTestExecutor(
-      CoroutineExecutorService(backgroundCoroutineDispatcher)
+      CoroutineExecutorService(backgroundDispatcher)
     )
     Glide.init(
       context,
diff --git a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditFragmentTest.kt
index 0b2bb33c202..feac49bcc26 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditFragmentTest.kt
@@ -23,6 +23,7 @@ import androidx.test.espresso.matcher.ViewMatchers.isRoot
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
 import dagger.Component
 import org.hamcrest.Matchers.not
 import org.junit.After
@@ -43,9 +44,11 @@ import org.oppia.android.app.application.testing.TestingBuildFlavorModule
 import org.oppia.android.app.devoptions.DeveloperOptionsModule
 import org.oppia.android.app.devoptions.DeveloperOptionsStarterModule
 import org.oppia.android.app.devoptions.markchapterscompleted.MarkChaptersCompletedActivity
+import org.oppia.android.app.model.ProfileId
 import org.oppia.android.app.player.state.itemviewmodel.SplitScreenInteractionModule
 import org.oppia.android.app.shim.ViewBindingShimModule
 import org.oppia.android.app.testing.ProfileEditFragmentTestActivity
+import org.oppia.android.app.testing.ProfileEditFragmentTestActivity.Companion.createProfileEditFragmentTestActivity
 import org.oppia.android.app.translation.testing.ActivityRecreatorTestModule
 import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape
 import org.oppia.android.data.backends.gae.NetworkConfigProdModule
@@ -109,31 +112,22 @@ import org.robolectric.annotation.LooperMode
 import javax.inject.Inject
 import javax.inject.Singleton
 
+/** Tests for [ProfileEditFragment]. */
+// FunctionName: test names are conventionally named with underscores.
+@Suppress("FunctionName")
 @RunWith(AndroidJUnit4::class)
 @LooperMode(LooperMode.Mode.PAUSED)
 @Config(application = ProfileEditFragmentTest.TestApplication::class, qualifiers = "port-xxhdpi")
 class ProfileEditFragmentTest {
 
-  @get:Rule
-  val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
+  @get:Rule val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
+  @get:Rule val oppiaTestRule = OppiaTestRule()
 
-  @get:Rule
-  val oppiaTestRule = OppiaTestRule()
-
-  @Inject
-  lateinit var context: Context
-
-  @Inject
-  lateinit var profileTestHelper: ProfileTestHelper
-
-  @Inject
-  lateinit var profileManagementController: ProfileManagementController
-
-  @Inject
-  lateinit var dataProviderTestMonitorFactory: DataProviderTestMonitor.Factory
-
-  @Inject
-  lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
+  @Inject lateinit var context: Context
+  @Inject lateinit var profileTestHelper: ProfileTestHelper
+  @Inject lateinit var profileManagementController: ProfileManagementController
+  @Inject lateinit var monitorFactory: DataProviderTestMonitor.Factory
+  @Inject lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
 
   @Before
   fun setUp() {
@@ -141,6 +135,7 @@ class ProfileEditFragmentTest {
     setUpTestApplicationComponent()
     testCoroutineDispatchers.registerIdlingResource()
     profileTestHelper.initializeProfiles()
+    TestPlatformParameterModule.reset()
   }
 
   @After
@@ -155,12 +150,7 @@ class ProfileEditFragmentTest {
 
   @Test
   fun testProfileEdit_startWithUserProfile_clickProfileDeletionButton_checkOpensDeletionDialog() {
-    launch<ProfileEditFragmentTestActivity>(
-      ProfileEditFragmentTestActivity.createProfileEditFragmentTestActivity(
-        context = context,
-        profileId = 1
-      )
-    ).use {
+    launchFragmentTestActivity(internalProfileId = 1).use {
       onView(withId(R.id.profile_delete_button)).perform(click())
       onView(withText(R.string.profile_edit_delete_dialog_message))
         .inRoot(isDialog()).check(matches(isDisplayed()))
@@ -170,12 +160,7 @@ class ProfileEditFragmentTest {
   @Test
   @Config(qualifiers = "land")
   fun testProfileEdit_configChange_startWithUserProfile_clickDelete_checkOpensDeletionDialog() {
-    launch<ProfileEditFragmentTestActivity>(
-      ProfileEditFragmentTestActivity.createProfileEditFragmentTestActivity(
-        context = context,
-        profileId = 1
-      )
-    ).use {
+    launchFragmentTestActivity(internalProfileId = 1).use {
       onView(isRoot()).perform(orientationLandscape())
       onView(withId(R.id.profile_delete_button)).perform(scrollTo()).perform(click())
       testCoroutineDispatchers.runCurrent()
@@ -187,12 +172,7 @@ class ProfileEditFragmentTest {
   @Test
   @Config(qualifiers = "land")
   fun testProfileEdit_startWithUserProfile_clickDelete_configChange_checkDeletionDialogIsVisible() {
-    launch<ProfileEditFragmentTestActivity>(
-      ProfileEditFragmentTestActivity.createProfileEditFragmentTestActivity(
-        context,
-        profileId = 1
-      )
-    ).use {
+    launchFragmentTestActivity(internalProfileId = 1).use {
       onView(withId(R.id.profile_delete_button)).perform(scrollTo()).perform(click())
       onView(isRoot()).perform(orientationLandscape())
       testCoroutineDispatchers.runCurrent()
@@ -212,13 +192,7 @@ class ProfileEditFragmentTest {
       colorRgb = -10710042,
       isAdmin = false
     ).toLiveData()
-    launch<ProfileEditFragmentTestActivity>(
-      ProfileEditFragmentTestActivity.createProfileEditFragmentTestActivity(
-        context = context,
-        profileId = 4
-      )
-    ).use {
-      testCoroutineDispatchers.runCurrent()
+    launchFragmentTestActivity(internalProfileId = 4).use {
       onView(withId(R.id.profile_edit_allow_download_container)).check(matches(not(isDisplayed())))
     }
   }
@@ -226,13 +200,7 @@ class ProfileEditFragmentTest {
   @Test
   fun testProfileEdit_userDoesNotHaveDownloadAccess_downloadDisabled_switchIsNotDisplayed() {
     TestPlatformParameterModule.forceEnableDownloadsSupport(false)
-    launch<ProfileEditFragmentTestActivity>(
-      ProfileEditFragmentTestActivity.createProfileEditFragmentTestActivity(
-        context = context,
-        profileId = 0
-      )
-    ).use {
-      testCoroutineDispatchers.runCurrent()
+    launchFragmentTestActivity(internalProfileId = 0).use {
       onView(withId(R.id.profile_edit_allow_download_container)).check(matches(not(isDisplayed())))
     }
   }
@@ -248,13 +216,7 @@ class ProfileEditFragmentTest {
       colorRgb = -10710042,
       isAdmin = false
     ).toLiveData()
-    launch<ProfileEditFragmentTestActivity>(
-      ProfileEditFragmentTestActivity.createProfileEditFragmentTestActivity(
-        context = context,
-        profileId = 4
-      )
-    ).use {
-      testCoroutineDispatchers.runCurrent()
+    launchFragmentTestActivity(internalProfileId = 4).use {
       onView(withId(R.id.profile_edit_allow_download_switch)).check(matches(isChecked()))
     }
   }
@@ -271,14 +233,8 @@ class ProfileEditFragmentTest {
       colorRgb = -10710042,
       isAdmin = false
     )
-    dataProviderTestMonitorFactory.waitForNextSuccessfulResult(addProfileProvider)
-    launch<ProfileEditFragmentTestActivity>(
-      ProfileEditFragmentTestActivity.createProfileEditFragmentTestActivity(
-        context = context,
-        profileId = 4
-      )
-    ).use {
-      testCoroutineDispatchers.runCurrent()
+    monitorFactory.waitForNextSuccessfulResult(addProfileProvider)
+    launchFragmentTestActivity(internalProfileId = 4).use {
       onView(isRoot()).perform(orientationLandscape())
       onView(withId(R.id.profile_edit_allow_download_switch)).check(matches(isChecked()))
     }
@@ -295,13 +251,7 @@ class ProfileEditFragmentTest {
       colorRgb = -10710042,
       isAdmin = false
     ).toLiveData()
-    launch<ProfileEditFragmentTestActivity>(
-      ProfileEditFragmentTestActivity.createProfileEditFragmentTestActivity(
-        context = context,
-        profileId = 4
-      )
-    ).use {
-      testCoroutineDispatchers.runCurrent()
+    launchFragmentTestActivity(internalProfileId = 4).use {
       onView(withId(R.id.profile_edit_allow_download_switch)).check(matches(isChecked()))
       onView(withId(R.id.profile_edit_allow_download_container)).perform(click())
       onView(withId(R.id.profile_edit_allow_download_switch)).check(matches(not(isChecked())))
@@ -319,13 +269,7 @@ class ProfileEditFragmentTest {
       colorRgb = -10710042,
       isAdmin = false
     ).toLiveData()
-    launch<ProfileEditFragmentTestActivity>(
-      ProfileEditFragmentTestActivity.createProfileEditFragmentTestActivity(
-        context = context,
-        profileId = 4
-      )
-    ).use {
-      testCoroutineDispatchers.runCurrent()
+    launchFragmentTestActivity(internalProfileId = 4).use {
       onView(withId(R.id.profile_edit_allow_download_switch)).check(matches(not(isClickable())))
     }
   }
@@ -341,13 +285,7 @@ class ProfileEditFragmentTest {
       colorRgb = -10710042,
       isAdmin = false
     ).toLiveData()
-    launch<ProfileEditFragmentTestActivity>(
-      ProfileEditFragmentTestActivity.createProfileEditFragmentTestActivity(
-        context = context,
-        profileId = 4
-      )
-    ).use {
-      testCoroutineDispatchers.runCurrent()
+    launchFragmentTestActivity(internalProfileId = 4).use {
       onView(withId(R.id.profile_edit_allow_download_container)).check(matches(isFocusable()))
     }
   }
@@ -363,13 +301,7 @@ class ProfileEditFragmentTest {
       colorRgb = -10710042,
       isAdmin = false
     ).toLiveData()
-    launch<ProfileEditFragmentTestActivity>(
-      ProfileEditFragmentTestActivity.createProfileEditFragmentTestActivity(
-        context = context,
-        profileId = 4
-      )
-    ).use {
-      testCoroutineDispatchers.runCurrent()
+    launchFragmentTestActivity(internalProfileId = 4).use {
       onView(withId(R.id.profile_edit_allow_download_container)).check(matches(isDisplayed()))
     }
   }
@@ -377,13 +309,7 @@ class ProfileEditFragmentTest {
   @Test
   fun testProfileEdit_userDoesNotHaveDownloadAccess_downloadsEnabled_switchIsNotDisplayed() {
     TestPlatformParameterModule.forceEnableDownloadsSupport(true)
-    launch<ProfileEditFragmentTestActivity>(
-      ProfileEditFragmentTestActivity.createProfileEditFragmentTestActivity(
-        context = context,
-        profileId = 0
-      )
-    ).use {
-      testCoroutineDispatchers.runCurrent()
+    launchFragmentTestActivity(internalProfileId = 0).use {
       onView(withId(R.id.profile_edit_allow_download_container)).check(matches(not(isDisplayed())))
     }
   }
@@ -391,13 +317,7 @@ class ProfileEditFragmentTest {
   @Test
   fun testProfileEdit_studyOff_doesNotHaveMarkChaptersCompletedButton() {
     TestPlatformParameterModule.forceEnableLearnerStudyAnalytics(false)
-    launch<ProfileEditFragmentTestActivity>(
-      ProfileEditFragmentTestActivity.createProfileEditFragmentTestActivity(
-        context = context,
-        profileId = 0
-      )
-    ).use {
-      testCoroutineDispatchers.runCurrent()
+    launchFragmentTestActivity(internalProfileId = 0).use {
       onView(withId(R.id.profile_mark_chapters_for_completion_button))
         .check(matches(not(isDisplayed())))
     }
@@ -406,13 +326,7 @@ class ProfileEditFragmentTest {
   @Test
   fun testProfileEdit_studyOn_hasMarkChaptersCompletedButton() {
     TestPlatformParameterModule.forceEnableLearnerStudyAnalytics(true)
-    launch<ProfileEditFragmentTestActivity>(
-      ProfileEditFragmentTestActivity.createProfileEditFragmentTestActivity(
-        context = context,
-        profileId = 0
-      )
-    ).use {
-      testCoroutineDispatchers.runCurrent()
+    launchFragmentTestActivity(internalProfileId = 0).use {
       onView(withId(R.id.profile_mark_chapters_for_completion_button)).check(matches(isDisplayed()))
     }
   }
@@ -421,13 +335,7 @@ class ProfileEditFragmentTest {
   @Config(qualifiers = "land")
   fun testProfileEdit_studyOn_landscape_hasMarkChaptersCompletedButton() {
     TestPlatformParameterModule.forceEnableLearnerStudyAnalytics(true)
-    launch<ProfileEditFragmentTestActivity>(
-      ProfileEditFragmentTestActivity.createProfileEditFragmentTestActivity(
-        context = context,
-        profileId = 0
-      )
-    ).use {
-      testCoroutineDispatchers.runCurrent()
+    launchFragmentTestActivity(internalProfileId = 0).use {
       onView(isRoot()).perform(orientationLandscape())
       onView(withId(R.id.profile_mark_chapters_for_completion_button)).check(matches(isDisplayed()))
     }
@@ -436,14 +344,7 @@ class ProfileEditFragmentTest {
   @Test
   fun testProfileEdit_studyOn_clickMarkChapsCompleted_opensMarkCompleteActivityForProfile() {
     TestPlatformParameterModule.forceEnableLearnerStudyAnalytics(true)
-    launch<ProfileEditFragmentTestActivity>(
-      ProfileEditFragmentTestActivity.createProfileEditFragmentTestActivity(
-        context = context,
-        profileId = 0
-      )
-    ).use {
-      testCoroutineDispatchers.runCurrent()
-
+    launchFragmentTestActivity(internalProfileId = 0).use {
       onView(withId(R.id.profile_mark_chapters_for_completion_button)).perform(click())
 
       intended(hasComponent(MarkChaptersCompletedActivity::class.java.name))
@@ -452,6 +353,112 @@ class ProfileEditFragmentTest {
     }
   }
 
+  @Test
+  fun testProfileEdit_studyOff_doesNotHaveEnableQuickSwitchingSwitch() {
+    TestPlatformParameterModule.forceEnableLearnerStudyAnalytics(false)
+
+    // Without the study feature enabled, the switch should not be visible.
+    launchFragmentTestActivity(internalProfileId = 0).use {
+      onView(withId(R.id.profile_edit_enable_in_lesson_language_switching_container))
+        .check(matches(not(isDisplayed())))
+    }
+  }
+
+  @Test
+  fun testProfileEdit_studyOn_hasEnableQuickSwitchingSwitch() {
+    TestPlatformParameterModule.forceEnableLearnerStudyAnalytics(true)
+
+    launchFragmentTestActivity(internalProfileId = 0).use {
+      onView(withId(R.id.profile_edit_enable_in_lesson_language_switching_container))
+        .check(matches(isDisplayed()))
+    }
+  }
+
+  @Test
+  @Config(qualifiers = "land")
+  fun testProfileEdit_studyOn_landscape_hasEnableQuickSwitchingSwitch() {
+    TestPlatformParameterModule.forceEnableLearnerStudyAnalytics(true)
+
+    launchFragmentTestActivity(internalProfileId = 0).use {
+      onView(isRoot()).perform(orientationLandscape())
+      testCoroutineDispatchers.runCurrent()
+
+      onView(withId(R.id.profile_edit_enable_in_lesson_language_switching_container))
+        .perform(scrollTo())
+
+      onView(withId(R.id.profile_edit_enable_in_lesson_language_switching_container))
+        .check(matches(isDisplayed()))
+    }
+  }
+
+  @Test
+  fun testProfileEdit_studyOn_doNotHaveSwitchingPermission_enableLanguageSwitchingIsOff() {
+    TestPlatformParameterModule.forceEnableLearnerStudyAnalytics(true)
+
+    // Without the permission to switch languages, the setting should be off by default.
+    launchFragmentTestActivity(internalProfileId = 0).use {
+      onView(withId(R.id.profile_edit_enable_in_lesson_language_switching_switch))
+        .check(matches(not(isChecked())))
+    }
+  }
+
+  @Test
+  fun testProfileEdit_studyOn_hasSwitchingPermission_enableLanguageSwitchingIsOn() {
+    TestPlatformParameterModule.forceEnableLearnerStudyAnalytics(true)
+
+    val updateLangProvider = profileManagementController.updateEnableInLessonQuickLanguageSwitching(
+      profileId = ProfileId.newBuilder().apply { internalId = 0 }.build(),
+      allowInLessonQuickLanguageSwitching = true
+    )
+    monitorFactory.waitForNextSuccessfulResult(updateLangProvider)
+
+    // With the permission to switch languages, the setting should be on by default.
+    launchFragmentTestActivity(internalProfileId = 0).use {
+      onView(withId(R.id.profile_edit_enable_in_lesson_language_switching_switch))
+        .check(matches(isChecked()))
+    }
+  }
+
+  @Test
+  fun testProfileEdit_studyOn_doNotClickEnableLanguageSwitching_doesNotHaveSwitchingPermission() {
+    TestPlatformParameterModule.forceEnableLearnerStudyAnalytics(true)
+    // Open the UI, but don't interact with it.
+    launchFragmentTestActivity(internalProfileId = 0).use {}
+
+    // The user should not have permission to switch languages (since the switch wasn't toggled).
+    val profileProvider =
+      profileManagementController.getProfile(
+        ProfileId.newBuilder().apply { internalId = 0 }.build()
+      )
+    val profile = monitorFactory.waitForNextSuccessfulResult(profileProvider)
+
+    assertThat(profile.allowInLessonQuickLanguageSwitching).isFalse()
+  }
+
+  @Test
+  fun testProfileEdit_studyOn_clickEnableLanguageSwitching_hasSwitchingPermission() {
+    TestPlatformParameterModule.forceEnableLearnerStudyAnalytics(true)
+
+    // Enable language switching in the UI.
+    launchFragmentTestActivity(internalProfileId = 0).use {
+      onView(withId(R.id.profile_edit_enable_in_lesson_language_switching_container))
+        .perform(click())
+    }
+
+    // The user should have permission to switch languages (since the switch was toggled).
+    val profileProvider =
+      profileManagementController.getProfile(
+        ProfileId.newBuilder().apply { internalId = 0 }.build()
+      )
+    val profile = monitorFactory.waitForNextSuccessfulResult(profileProvider)
+    assertThat(profile.allowInLessonQuickLanguageSwitching).isTrue()
+  }
+
+  private fun launchFragmentTestActivity(internalProfileId: Int) =
+    launch<ProfileEditFragmentTestActivity>(
+      createProfileEditFragmentTestActivity(context, internalProfileId)
+    ).also { testCoroutineDispatchers.runCurrent() }
+
   @Singleton
   @Component(
     modules = [
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 f9acce2da02..e487689534d 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
@@ -91,9 +91,11 @@ import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule
 import org.oppia.android.domain.topic.RATIOS_STORY_ID_0
 import org.oppia.android.domain.topic.RATIOS_TOPIC_ID
 import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule
+import org.oppia.android.testing.FakeAnalyticsEventLogger
 import org.oppia.android.testing.OppiaTestRule
 import org.oppia.android.testing.TestLogReportingModule
 import org.oppia.android.testing.junit.InitializeDefaultLocaleRule
+import org.oppia.android.testing.logging.EventLogSubject.Companion.assertThat
 import org.oppia.android.testing.platformparameter.TestPlatformParameterModule
 import org.oppia.android.testing.robolectric.RobolectricModule
 import org.oppia.android.testing.story.StoryProgressTestHelper
@@ -130,6 +132,8 @@ private const val LESSON_TAB_POSITION_EXTRA_TABS_DISABLED = 0
 private const val REVISION_TAB_POSITION_EXTRA_TABS_DISABLED = 1
 
 /** Tests for [TopicFragment]. */
+// FunctionName: test names are conventionally named with underscores.
+@Suppress("FunctionName")
 @RunWith(AndroidJUnit4::class)
 @LooperMode(LooperMode.Mode.PAUSED)
 @Config(
@@ -137,39 +141,30 @@ private const val REVISION_TAB_POSITION_EXTRA_TABS_DISABLED = 1
   qualifiers = "port-xxhdpi"
 )
 class TopicFragmentTest {
-  @get:Rule
-  val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
-
-  @get:Rule
-  val oppiaTestRule = OppiaTestRule()
+  @get:Rule val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
+  @get:Rule val oppiaTestRule = OppiaTestRule()
 
   @get:Rule
   var activityTestRule: ActivityTestRule<TopicActivity> = ActivityTestRule(
     TopicActivity::class.java, /* initialTouchMode= */ true, /* launchActivity= */ false
   )
 
-  @Inject
-  lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
-
-  @Inject
-  lateinit var spotlightStateController: SpotlightStateController
-
-  @Inject
-  lateinit var fakeOppiaClock: FakeOppiaClock
-
-  @Inject
-  lateinit var storyProgressTestHelper: StoryProgressTestHelper
+  @Inject lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
+  @Inject lateinit var spotlightStateController: SpotlightStateController
+  @Inject lateinit var fakeOppiaClock: FakeOppiaClock
+  @Inject lateinit var storyProgressTestHelper: StoryProgressTestHelper
+  @Inject lateinit var fakeAnalyticsEventLogger: FakeAnalyticsEventLogger
 
   @field:[Inject EnableExtraTopicTabsUi]
   lateinit var enableExtraTopicTabsUi: PlatformParameterValue<Boolean>
 
   private val internalProfileId = 0
-
   private val TOPIC_NAME = "Fractions"
 
   @Before
   fun setUp() {
     Intents.init()
+    TestPlatformParameterModule.reset()
   }
 
   @After
@@ -697,7 +692,6 @@ class TopicFragmentTest {
       FRACTIONS_TOPIC_ID,
       FRACTIONS_STORY_ID_0
     ).use {
-      testCoroutineDispatchers.runCurrent()
       clickTabAtPosition(position = PRACTICE_TAB_POSITION)
       testCoroutineDispatchers.runCurrent()
       matchStringOnListItem(
@@ -718,6 +712,100 @@ class TopicFragmentTest {
     }
   }
 
+  @Test
+  fun testOpenFragment_lessonsTabDefaulted_logsLessonsTabOpen() {
+    initializeApplicationComponent(enableExtraTabsUi = false)
+    markAllSpotlightsSeen()
+    launchTopicPlayStoryActivityIntent(
+      internalProfileId,
+      FRACTIONS_TOPIC_ID,
+      FRACTIONS_STORY_ID_0
+    ).use {
+      assertThat(fakeAnalyticsEventLogger.getMostRecentEvent())
+        .hasOpenLessonsTabContextThat()
+        .hasTopicIdThat()
+        .isEqualTo(FRACTIONS_TOPIC_ID)
+    }
+  }
+
+  @Test
+  fun testOpenFragment_lessonsTabDefaulted_switchToRevisionTab_logsRevisionTabOpen() {
+    initializeApplicationComponent(enableExtraTabsUi = false)
+    markAllSpotlightsSeen()
+    launchTopicPlayStoryActivityIntent(
+      internalProfileId,
+      FRACTIONS_TOPIC_ID,
+      FRACTIONS_STORY_ID_0
+    ).use {
+      clickTabAtPosition(position = REVISION_TAB_POSITION_EXTRA_TABS_DISABLED)
+      testCoroutineDispatchers.runCurrent()
+
+      assertThat(fakeAnalyticsEventLogger.getMostRecentEvent())
+        .hasOpenRevisionTabContextThat()
+        .hasTopicIdThat()
+        .isEqualTo(FRACTIONS_TOPIC_ID)
+    }
+  }
+
+  @Test
+  fun testOpenFragment_lessonsTabDefaulted_switchToRevisionTabThenBack_logsLessonsTabOpenAgain() {
+    initializeApplicationComponent(enableExtraTabsUi = false)
+    markAllSpotlightsSeen()
+    launchTopicPlayStoryActivityIntent(
+      internalProfileId,
+      FRACTIONS_TOPIC_ID,
+      FRACTIONS_STORY_ID_0
+    ).use {
+      clickTabAtPosition(position = REVISION_TAB_POSITION_EXTRA_TABS_DISABLED)
+      testCoroutineDispatchers.runCurrent()
+      clickTabAtPosition(position = LESSON_TAB_POSITION_EXTRA_TABS_DISABLED)
+      testCoroutineDispatchers.runCurrent()
+
+      assertThat(fakeAnalyticsEventLogger.getMostRecentEvent())
+        .hasOpenLessonsTabContextThat()
+        .hasTopicIdThat()
+        .isEqualTo(FRACTIONS_TOPIC_ID)
+    }
+  }
+
+  @Test
+  fun testOpenFragment_extraTabs_openInfoTab_logsInfoTabOpen() {
+    initializeApplicationComponent(enableExtraTabsUi = true)
+    markAllSpotlightsSeen()
+    launchTopicPlayStoryActivityIntent(
+      internalProfileId,
+      FRACTIONS_TOPIC_ID,
+      FRACTIONS_STORY_ID_0
+    ).use {
+      clickTabAtPosition(position = INFO_TAB_POSITION)
+      testCoroutineDispatchers.runCurrent()
+
+      assertThat(fakeAnalyticsEventLogger.getMostRecentEvent())
+        .hasOpenInfoTabContextThat()
+        .hasTopicIdThat()
+        .isEqualTo(FRACTIONS_TOPIC_ID)
+    }
+  }
+
+  @Test
+  fun testOpenFragment_extraTabs_openQuestionsTab_logsInfoQuestionsOpen() {
+    initializeApplicationComponent(enableExtraTabsUi = true)
+    markAllSpotlightsSeen()
+    launchTopicPlayStoryActivityIntent(
+      internalProfileId,
+      FRACTIONS_TOPIC_ID,
+      FRACTIONS_STORY_ID_0
+    ).use {
+      clickTabAtPosition(position = PRACTICE_TAB_POSITION)
+      testCoroutineDispatchers.runCurrent()
+
+      assertThat(fakeAnalyticsEventLogger.getMostRecentEvent())
+        .hasOpenPracticeTabContextThat()
+        .hasTopicIdThat()
+        .isEqualTo(FRACTIONS_TOPIC_ID)
+    }
+  }
+
   /**
    * Creates TopicActivity Intent without a storyId
    */
@@ -762,7 +850,9 @@ class TopicFragmentTest {
     topicId: String,
     storyId: String
   ): ActivityScenario<TopicActivity> {
-    return launch(createTopicPlayStoryActivityIntent(internalProfileId, topicId, storyId))
+    return launch<TopicActivity>(
+      createTopicPlayStoryActivityIntent(internalProfileId, topicId, storyId)
+    ).also { testCoroutineDispatchers.runCurrent() }
   }
 
   private fun clickTabAtPosition(position: Int) {
diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityTest.kt
index 349db2e4940..b87a83622a7 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityTest.kt
@@ -10,9 +10,11 @@ import androidx.core.view.ViewCompat
 import androidx.test.core.app.ActivityScenario
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.Espresso.pressBack
 import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.withContentDescription
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -77,12 +79,14 @@ import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule
 import org.oppia.android.domain.translation.TranslationController
 import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule
 import org.oppia.android.testing.BuildEnvironment
+import org.oppia.android.testing.FakeAnalyticsEventLogger
 import org.oppia.android.testing.OppiaTestRule
 import org.oppia.android.testing.RunOn
 import org.oppia.android.testing.TestLogReportingModule
 import org.oppia.android.testing.TestPlatform
 import org.oppia.android.testing.data.DataProviderTestMonitor
 import org.oppia.android.testing.junit.InitializeDefaultLocaleRule
+import org.oppia.android.testing.logging.EventLogSubject.Companion.assertThat
 import org.oppia.android.testing.robolectric.RobolectricModule
 import org.oppia.android.testing.threading.TestCoroutineDispatchers
 import org.oppia.android.testing.threading.TestDispatcherModule
@@ -110,6 +114,8 @@ import javax.inject.Singleton
 private const val FRACTIONS_SUBTOPIC_LIST_SIZE = 4
 
 /** Tests for [RevisionCardActivity]. */
+// FunctionName: test names are conventionally named with underscores.
+@Suppress("FunctionName")
 @RunWith(AndroidJUnit4::class)
 @LooperMode(LooperMode.Mode.PAUSED)
 @Config(
@@ -117,23 +123,14 @@ private const val FRACTIONS_SUBTOPIC_LIST_SIZE = 4
   qualifiers = "port-xxhdpi"
 )
 class RevisionCardActivityTest {
-  @get:Rule
-  val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
+  @get:Rule val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
+  @get:Rule val oppiaTestRule = OppiaTestRule()
 
-  @get:Rule
-  val oppiaTestRule = OppiaTestRule()
-
-  @Inject
-  lateinit var context: Context
-
-  @Inject
-  lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
-
-  @Inject
-  lateinit var translationController: TranslationController
-
-  @Inject
-  lateinit var monitorFactory: DataProviderTestMonitor.Factory
+  @Inject lateinit var context: Context
+  @Inject lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
+  @Inject lateinit var translationController: TranslationController
+  @Inject lateinit var monitorFactory: DataProviderTestMonitor.Factory
+  @Inject lateinit var fakeAnalyticsEventLogger: FakeAnalyticsEventLogger
 
   private val profileId = ProfileId.newBuilder().apply { internalId = 1 }.build()
 
@@ -242,6 +239,114 @@ class RevisionCardActivityTest {
     }
   }
 
+  @Test
+  fun testActivity_requestReturnToTopic_finishesActivity() {
+    launchRevisionCardActivity(
+      profileId = profileId,
+      topicId = FRACTIONS_TOPIC_ID,
+      subtopicId = 1
+    ).use { scenario ->
+      scenario.onActivity { activity ->
+        activity.onReturnToTopicRequested()
+        testCoroutineDispatchers.runCurrent()
+
+        assertThat(activity.isFinishing).isTrue()
+      }
+    }
+  }
+
+  @Test
+  fun testActivity_requestReturnToTopic_logsCloseRevisionEvent() {
+    launchRevisionCardActivity(
+      profileId = profileId,
+      topicId = FRACTIONS_TOPIC_ID,
+      subtopicId = 1
+    ).use { scenario ->
+      scenario.onActivity { activity ->
+        activity.onReturnToTopicRequested()
+        testCoroutineDispatchers.runCurrent()
+
+        val latestEvent = fakeAnalyticsEventLogger.getMostRecentEvent()
+        assertThat(latestEvent).hasCloseRevisionCardContextThat {
+          hasTopicIdThat().isEqualTo(FRACTIONS_TOPIC_ID)
+          hasSubtopicIndexThat().isEqualTo(1)
+        }
+      }
+    }
+  }
+
+  @Test
+  fun testActivity_clickNavigationBack_finishesActivity() {
+    launchRevisionCardActivity(
+      profileId = profileId,
+      topicId = FRACTIONS_TOPIC_ID,
+      subtopicId = 1
+    ).use { scenario ->
+      onView(withContentDescription("Navigate up")).perform(click())
+      testCoroutineDispatchers.runCurrent()
+
+      scenario.onActivity { activity ->
+        assertThat(activity.isFinishing).isTrue()
+      }
+    }
+  }
+
+  @Test
+  fun testActivity_clickNavigationBack_logsCloseRevisionEvent() {
+    launchRevisionCardActivity(
+      profileId = profileId,
+      topicId = FRACTIONS_TOPIC_ID,
+      subtopicId = 1
+    ).use { scenario ->
+      onView(withContentDescription("Navigate up")).perform(click())
+      testCoroutineDispatchers.runCurrent()
+
+      scenario.onActivity {
+        val latestEvent = fakeAnalyticsEventLogger.getMostRecentEvent()
+        assertThat(latestEvent).hasCloseRevisionCardContextThat {
+          hasTopicIdThat().isEqualTo(FRACTIONS_TOPIC_ID)
+          hasSubtopicIndexThat().isEqualTo(1)
+        }
+      }
+    }
+  }
+
+  @Test
+  fun testActivity_pressBack_finishesActivity() {
+    launchRevisionCardActivity(
+      profileId = profileId,
+      topicId = FRACTIONS_TOPIC_ID,
+      subtopicId = 1
+    ).use { scenario ->
+      pressBack()
+      testCoroutineDispatchers.runCurrent()
+
+      scenario.onActivity { activity ->
+        assertThat(activity.isFinishing).isTrue()
+      }
+    }
+  }
+
+  @Test
+  fun testActivity_pressBack_logsCloseRevisionEvent() {
+    launchRevisionCardActivity(
+      profileId = profileId,
+      topicId = FRACTIONS_TOPIC_ID,
+      subtopicId = 1
+    ).use { scenario ->
+      pressBack()
+      testCoroutineDispatchers.runCurrent()
+
+      scenario.onActivity {
+        val latestEvent = fakeAnalyticsEventLogger.getMostRecentEvent()
+        assertThat(latestEvent).hasCloseRevisionCardContextThat {
+          hasTopicIdThat().isEqualTo(FRACTIONS_TOPIC_ID)
+          hasSubtopicIndexThat().isEqualTo(1)
+        }
+      }
+    }
+  }
+
   private fun setUpTestApplicationComponent() {
     ApplicationProvider.getApplicationContext<TestApplication>().inject(this)
   }
diff --git a/domain/src/main/assets/test_topic_id_0_1.json b/domain/src/main/assets/test_topic_id_0_1.json
index ebb922a9f46..c57d6fee395 100644
--- a/domain/src/main/assets/test_topic_id_0_1.json
+++ b/domain/src/main/assets/test_topic_id_0_1.json
@@ -7,7 +7,7 @@
   "page_contents": {
     "subtitled_html": {
       "content_id": "content",
-      "html": "<p>Description of subtopic is here.</p><p>This is sample subtopic with dummy content not related to anything in particular. Note that this is multiple paragraphs to simulate more realistic subtopic content. <oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;test_skill_id_0&amp;quot;\" text-with-value=\"&amp;quot;test_skill_id_0 concept card&amp;quot;\"></oppia-noninteractive-skillreview>.</p><p><oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;test_skill_id_1&amp;quot;\" text-with-value=\"&amp;quot;test_skill_id_1 concept card&amp;quot;\"></oppia-noninteractive-skillreview></p>"
+      "html": "<p>Description of subtopic is here.</p><p>This is sample subtopic with dummy content not related to anything in particular. Note that this is multiple paragraphs to simulate more realistic subtopic content. <oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;test_skill_id_0&amp;quot;\" text-with-value=\"&amp;quot;test_skill_id_0 concept card&amp;quot;\"></oppia-noninteractive-skillreview>.</p><p><oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;test_skill_id_1&amp;quot;\" text-with-value=\"&amp;quot;test_skill_id_1 concept card&amp;quot;\"></oppia-noninteractive-skillreview></p><p /><p />Numbered list with deep nesting:<p /><p /><ol><li>Level 1 item A</li><li>Level 1 item B with long text to test paragraph wrapping. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam sagittis neque ut sodales posuere. Pellentesque sagittis dolor eget massa ultrices pellentesque. Ut non vestibulum quam. Cras nibh purus, euismod id finibus a, pulvinar ut mauris.</li><li>Level 1 item C<ol><li>Level 2 item A<ol><li>Level 3 item A<ol><li>Level 4 item A<ol><li>Level 5 item B with long text to test paragraph wrapping. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam sagittis neque ut sodales posuere. Pellentesque sagittis dolor eget massa ultrices pellentesque. Ut non vestibulum quam. Cras nibh purus, euismod id finibus a, pulvinar ut mauris.</li></ol></li></ol></li></ol></li><li>Level 2 item C<ol><li>Level 3 item B</li><li>Level 3 item C</li><li>Level 3 item D</li></ol></li></ol></li><li>Level 1 item D</li><li>Level 1 item E</li><li>Level 1 item F</li><li>Level 1 item G</li><li>Level 1 item H</li><li>Level 1 item I</li><li>Level 1 item J</li><li>Level 1 item K</li><li>Level 1 item L</li><li>Level 1 item M</li></ol><p /><p />Bullet list with deep nesting:<p /><p /><ul><li>Level 1 item A</li><li>Level 1 item B with long text to test paragraph wrapping. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam sagittis neque ut sodales posuere. Pellentesque sagittis dolor eget massa ultrices pellentesque. Ut non vestibulum quam. Cras nibh purus, euismod id finibus a, pulvinar ut mauris.</li><li>Level 1 item C<ul><li>Level 2 item A<ul><li>Level 3 item A<ul><li>Level 4 item A<ul><li>Level 5 item B with long text to test paragraph wrapping. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam sagittis neque ut sodales posuere. Pellentesque sagittis dolor eget massa ultrices pellentesque. Ut non vestibulum quam. Cras nibh purus, euismod id finibus a, pulvinar ut mauris.</li></ul></li></ul></li></ul></li><li>Level 2 item C<ul><li>Level 3 item B</li><li>Level 3 item C</li><li>Level 3 item D</li></ul></li></ul></li><li>Level 1 item D</li></ul><p /><p />List with alternating numbered/bullet lists (starting with numbers):<ol><li>Level 1 item A</li><li>Level 1 item B with long text to test paragraph wrapping. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam sagittis neque ut sodales posuere. Pellentesque sagittis dolor eget massa ultrices pellentesque. Ut non vestibulum quam. Cras nibh purus, euismod id finibus a, pulvinar ut mauris.</li><li>Level 1 item C<ul><li>Level 2 item A<ol><li>Level 3 item A<ul><li>Level 4 item A<ol><li>Level 5 item B with long text to test paragraph wrapping. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam sagittis neque ut sodales posuere. Pellentesque sagittis dolor eget massa ultrices pellentesque. Ut non vestibulum quam. Cras nibh purus, euismod id finibus a, pulvinar ut mauris.</li></ol></li></ul></li></ol></li><li>Level 2 item C<ol><li>Level 3 item B</li><li>Level 3 item C</li><li>Level 3 item D</li></ol></li></ul></li><li>Level 1 item D</li></ol><p /><p />List with alternating numbered/bullet lists (starting with bullets):<ul><li>Level 1 item A</li><li>Level 1 item B with long text to test paragraph wrapping. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam sagittis neque ut sodales posuere. Pellentesque sagittis dolor eget massa ultrices pellentesque. Ut non vestibulum quam. Cras nibh purus, euismod id finibus a, pulvinar ut mauris.</li><li>Level 1 item C<ol><li>Level 2 item A<ul><li>Level 3 item A<ol><li>Level 4 item A<ul><li>Level 5 item B with long text to test paragraph wrapping. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam sagittis neque ut sodales posuere. Pellentesque sagittis dolor eget massa ultrices pellentesque. Ut non vestibulum quam. Cras nibh purus, euismod id finibus a, pulvinar ut mauris.</li></ul></li></ol></li></ul></li><li>Level 2 item C<ul><li>Level 3 item B</li><li>Level 3 item C</li><li>Level 3 item D</li></ul></li></ol></li><li>Level 1 item D</li></ul>"
     },
     "recorded_voiceovers": {
       "voiceovers_mapping": {
@@ -41,7 +41,7 @@
           },
           "ar": {
             "data_format": "html",
-            "translation": {"translation" : "<p> وصف subtopic هنا. </p> <p> هذا هو نموذج subtopic مع محتوى وهمية لا يرتبط بأي شيء على وجه الخصوص. لاحظ أن هذه فقرات متعددة محاكاة محتوى أكثر واقعية. <oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;test_skill_id_0&amp;quot;\" text-with-value=\"&amp;quot; نص مع القيمة test_skill_id_0 concept card&amp;quot;\"></oppia-noninteractive-skillreview>. </p> <p> <oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;test_skill_id_1&amp;quot;\" text-with-value=\"&amp;quot; نص مع القيمة test_skill_id_1 concept card&amp;quot;\"></oppia-noninteractive-skillreview></p>"},
+            "translation": {"translation" : "<p> وصف subtopic هنا. </p> <p> هذا هو نموذج subtopic مع محتوى وهمية لا يرتبط بأي شيء على وجه الخصوص. لاحظ أن هذه فقرات متعددة محاكاة محتوى أكثر واقعية. <oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;test_skill_id_0&amp;quot;\" text-with-value=\"&amp;quot; نص مع القيمة test_skill_id_0 concept card&amp;quot;\"></oppia-noninteractive-skillreview>. </p> <p> <oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;test_skill_id_1&amp;quot;\" text-with-value=\"&amp;quot; نص مع القيمة test_skill_id_1 concept card&amp;quot;\"></oppia-noninteractive-skillreview></p><p /><p />قائمة مرقمة مع تداخل عميق:<p /><p /><ol><li>المستوى الأول العنصر الأول</li><li>عنصر المستوى الثاني مع نص طويل لاختبار التفاف الفقرة. جمعت واعتلاء ثم حتى. تاريخ الآلاف والديون هو تحت، بقسوة الذود بين. من تلك وزارة التجارة. البرية قد عدد. منتصف التخطيط دول في، دول عرفها وبداية ٣٠. وقوعها ، بمباركة و لها.</li><li>المستوى الثالث البند الثالث<ol><li>المستوى الثاني ، العنصر الأول<ol><li>المستوى الثالث ، العنصر الأول<ol><li>المستوى الرابع ، العنصر الأول<ol><li>المستوى الخامس ، العنصر الأول بنص طويل لاختبار التفاف الفقرة. جمعت واعتلاء ثم حتى. تاريخ الآلاف والديون هو تحت، بقسوة الذود بين. من تلك وزارة التجارة. البرية قد عدد. منتصف التخطيط دول في، دول عرفها وبداية ٣٠. وقوعها ، بمباركة و لها.</li></ol></li></ol></li></ol></li><li>عنصر المستوى الثاني الثاني<ol><li>عنصر المستوى الثالث الثاني</li><li>المستوى الثالث ، العنصر الثالث</li><li>المستوى الثالث ، العنصر الرابع</li></ol></li></ol></li><li>المستوى الرابع ، البند الرابع</li><li>المستوى الأول - البند الخامس</li><li>المستوى الأول البند السادس</li><li>العنصر السابع من المستوى الأول</li><li>المستوى الثامن البند</li><li>المستوى الأول البند التاسع</li><li>العنصر العاشر من المستوى الأول</li><li>المستوى الأول ، البند الحادي عشر</li><li>البند الثاني عشر من المستوى الأول</li><li>المستوى الأول ، البند الثالث عشر</li></ol><p /><p />قائمة نقطية مع تداخل عميق:<p /><p /><ul><li>المستوى الأول العنصر الأول</li><li>عنصر المستوى الثاني مع نص طويل لاختبار التفاف الفقرة. جمعت واعتلاء ثم حتى. تاريخ الآلاف والديون هو تحت، بقسوة الذود بين. من تلك وزارة التجارة. البرية قد عدد. منتصف التخطيط دول في، دول عرفها وبداية ٣٠. وقوعها ، بمباركة و لها.</li><li>المستوى الثالث البند الثالث<ul><li>المستوى الثاني ، العنصر الأول<ul><li>المستوى الثالث ، العنصر الأول<ul><li>المستوى الرابع ، العنصر الأول<ul><li>المستوى الخامس ، العنصر الأول بنص طويل لاختبار التفاف الفقرة. جمعت واعتلاء ثم حتى. تاريخ الآلاف والديون هو تحت، بقسوة الذود بين. من تلك وزارة التجارة. البرية قد عدد. منتصف التخطيط دول في، دول عرفها وبداية ٣٠. وقوعها ، بمباركة و لها.</li></ul></li></ul></li></ul></li><li>عنصر المستوى الثاني الثاني<ul><li>عنصر المستوى الثالث الثاني</li><li>المستوى الثالث ، العنصر الثالث</li><li>المستوى الثالث ، العنصر الرابع</li></ul></li></ul></li><li>المستوى الرابع ، البند الرابع</li></ul><p /><p />قائمة بقوائم مرقمة / نقطية بديلة (تبدأ بالأرقام):<ol><li>المستوى الأول العنصر الأول</li><li>عنصر المستوى الثاني مع نص طويل لاختبار التفاف الفقرة. جمعت واعتلاء ثم حتى. تاريخ الآلاف والديون هو تحت، بقسوة الذود بين. من تلك وزارة التجارة. البرية قد عدد. منتصف التخطيط دول في، دول عرفها وبداية ٣٠. وقوعها ، بمباركة و لها.</li><li>المستوى الثالث البند الثالث<ul><li>المستوى الثاني ، العنصر الأول<ol><li>المستوى الثالث ، العنصر الأول<ul><li>المستوى الرابع ، العنصر الأول<ol><li>المستوى الخامس ، العنصر الأول بنص طويل لاختبار التفاف الفقرة. جمعت واعتلاء ثم حتى. تاريخ الآلاف والديون هو تحت، بقسوة الذود بين. من تلك وزارة التجارة. البرية قد عدد. منتصف التخطيط دول في، دول عرفها وبداية ٣٠. وقوعها ، بمباركة و لها.</li></ol></li></ul></li></ol></li><li>عنصر المستوى الثاني الثاني<ol><li>عنصر المستوى الثالث الثاني</li><li>المستوى الثالث ، العنصر الثالث</li><li>المستوى الثالث ، العنصر الرابع</li></ol></li></ul></li><li>المستوى الرابع ، البند الرابع</li></ol><p /><p />قائمة بقوائم ذات تعداد رقمي / تعداد نقطي (بدءًا من الرموز النقطية):<ul><li>المستوى الأول العنصر الأول</li><li>عنصر المستوى الثاني مع نص طويل لاختبار التفاف الفقرة. جمعت واعتلاء ثم حتى. تاريخ الآلاف والديون هو تحت، بقسوة الذود بين. من تلك وزارة التجارة. البرية قد عدد. منتصف التخطيط دول في، دول عرفها وبداية ٣٠. وقوعها ، بمباركة و لها.</li><li>المستوى الثالث البند الثالث<ol><li>المستوى الثاني ، العنصر الأول<ul><li>المستوى الثالث ، العنصر الأول<ol><li>المستوى الرابع ، العنصر الأول<ul><li>المستوى الخامس ، العنصر الأول بنص طويل لاختبار التفاف الفقرة. جمعت واعتلاء ثم حتى. تاريخ الآلاف والديون هو تحت، بقسوة الذود بين. من تلك وزارة التجارة. البرية قد عدد. منتصف التخطيط دول في، دول عرفها وبداية ٣٠. وقوعها ، بمباركة و لها.</li></ul></li></ol></li></ul></li><li>عنصر المستوى الثاني الثاني<ul><li>عنصر المستوى الثالث الثاني</li><li>المستوى الثالث ، العنصر الثالث</li><li>المستوى الثالث ، العنصر الرابع</li></ul></li></ol></li><li>المستوى الرابع ، البند الرابع</li></ul>"},
             "needs_update": false
           },
           "sw": {
diff --git a/domain/src/main/assets/test_topic_id_0_1.textproto b/domain/src/main/assets/test_topic_id_0_1.textproto
index 0e4f27b8ac6..889ccd97bee 100644
--- a/domain/src/main/assets/test_topic_id_0_1.textproto
+++ b/domain/src/main/assets/test_topic_id_0_1.textproto
@@ -1,5 +1,5 @@
 page_contents {
-  html: "<p>Description of subtopic is here.</p><p>This is sample subtopic with dummy content not related to anything in particular. Note that this is multiple paragraphs to simulate more realistic subtopic content. <oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;test_skill_id_0&amp;quot;\" text-with-value=\"&amp;quot;test_skill_id_0 concept card&amp;quot;\"></oppia-noninteractive-skillreview>.</p><p><oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;test_skill_id_1&amp;quot;\" text-with-value=\"&amp;quot;test_skill_id_1 concept card&amp;quot;\"></oppia-noninteractive-skillreview></p>"
+  html: "<p>Description of subtopic is here.</p><p>This is sample subtopic with dummy content not related to anything in particular. Note that this is multiple paragraphs to simulate more realistic subtopic content. <oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;test_skill_id_0&amp;quot;\" text-with-value=\"&amp;quot;test_skill_id_0 concept card&amp;quot;\"></oppia-noninteractive-skillreview>.</p><p><oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;test_skill_id_1&amp;quot;\" text-with-value=\"&amp;quot;test_skill_id_1 concept card&amp;quot;\"></oppia-noninteractive-skillreview></p><p /><p />Numbered list with deep nesting:<p /><p /><ol><li>Level 1 item A</li><li>Level 1 item B with long text to test paragraph wrapping. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam sagittis neque ut sodales posuere. Pellentesque sagittis dolor eget massa ultrices pellentesque. Ut non vestibulum quam. Cras nibh purus, euismod id finibus a, pulvinar ut mauris.</li><li>Level 1 item C<ol><li>Level 2 item A<ol><li>Level 3 item A<ol><li>Level 4 item A<ol><li>Level 5 item B with long text to test paragraph wrapping. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam sagittis neque ut sodales posuere. Pellentesque sagittis dolor eget massa ultrices pellentesque. Ut non vestibulum quam. Cras nibh purus, euismod id finibus a, pulvinar ut mauris.</li></ol></li></ol></li></ol></li><li>Level 2 item C<ol><li>Level 3 item B</li><li>Level 3 item C</li><li>Level 3 item D</li></ol></li></ol></li><li>Level 1 item D</li><li>Level 1 item E</li><li>Level 1 item F</li><li>Level 1 item G</li><li>Level 1 item H</li><li>Level 1 item I</li><li>Level 1 item J</li><li>Level 1 item K</li><li>Level 1 item L</li><li>Level 1 item M</li></ol><p /><p />Bullet list with deep nesting:<p /><p /><ul><li>Level 1 item A</li><li>Level 1 item B with long text to test paragraph wrapping. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam sagittis neque ut sodales posuere. Pellentesque sagittis dolor eget massa ultrices pellentesque. Ut non vestibulum quam. Cras nibh purus, euismod id finibus a, pulvinar ut mauris.</li><li>Level 1 item C<ul><li>Level 2 item A<ul><li>Level 3 item A<ul><li>Level 4 item A<ul><li>Level 5 item B with long text to test paragraph wrapping. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam sagittis neque ut sodales posuere. Pellentesque sagittis dolor eget massa ultrices pellentesque. Ut non vestibulum quam. Cras nibh purus, euismod id finibus a, pulvinar ut mauris.</li></ul></li></ul></li></ul></li><li>Level 2 item C<ul><li>Level 3 item B</li><li>Level 3 item C</li><li>Level 3 item D</li></ul></li></ul></li><li>Level 1 item D</li></ul><p /><p />List with alternating numbered/bullet lists (starting with numbers):<ol><li>Level 1 item A</li><li>Level 1 item B with long text to test paragraph wrapping. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam sagittis neque ut sodales posuere. Pellentesque sagittis dolor eget massa ultrices pellentesque. Ut non vestibulum quam. Cras nibh purus, euismod id finibus a, pulvinar ut mauris.</li><li>Level 1 item C<ul><li>Level 2 item A<ol><li>Level 3 item A<ul><li>Level 4 item A<ol><li>Level 5 item B with long text to test paragraph wrapping. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam sagittis neque ut sodales posuere. Pellentesque sagittis dolor eget massa ultrices pellentesque. Ut non vestibulum quam. Cras nibh purus, euismod id finibus a, pulvinar ut mauris.</li></ol></li></ul></li></ol></li><li>Level 2 item C<ol><li>Level 3 item B</li><li>Level 3 item C</li><li>Level 3 item D</li></ol></li></ul></li><li>Level 1 item D</li></ol><p /><p />List with alternating numbered/bullet lists (starting with bullets):<ul><li>Level 1 item A</li><li>Level 1 item B with long text to test paragraph wrapping. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam sagittis neque ut sodales posuere. Pellentesque sagittis dolor eget massa ultrices pellentesque. Ut non vestibulum quam. Cras nibh purus, euismod id finibus a, pulvinar ut mauris.</li><li>Level 1 item C<ol><li>Level 2 item A<ul><li>Level 3 item A<ol><li>Level 4 item A<ul><li>Level 5 item B with long text to test paragraph wrapping. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam sagittis neque ut sodales posuere. Pellentesque sagittis dolor eget massa ultrices pellentesque. Ut non vestibulum quam. Cras nibh purus, euismod id finibus a, pulvinar ut mauris.</li></ul></li></ol></li></ul></li><li>Level 2 item C<ul><li>Level 3 item B</li><li>Level 3 item C</li><li>Level 3 item D</li></ul></li></ol></li><li>Level 1 item D</li></ul>"
   content_id: "content"
 }
 recorded_voiceover {
@@ -42,7 +42,7 @@ written_translation {
     translation_mapping {
       key: "ar"
       value {
-        html: "<p> \331\210\330\265\331\201 subtopic \331\207\331\206\330\247. </p> <p> \331\207\330\260\330\247 \331\207\331\210 \331\206\331\205\331\210\330\260\330\254 subtopic \331\205\330\271 \331\205\330\255\330\252\331\210\331\211 \331\210\331\207\331\205\331\212\330\251 \331\204\330\247 \331\212\330\261\330\252\330\250\330\267 \330\250\330\243\331\212 \330\264\331\212\330\241 \330\271\331\204\331\211 \331\210\330\254\331\207 \330\247\331\204\330\256\330\265\331\210\330\265. \331\204\330\247\330\255\330\270 \330\243\331\206 \331\207\330\260\331\207 \331\201\331\202\330\261\330\247\330\252 \331\205\330\252\330\271\330\257\330\257\330\251 \331\205\330\255\330\247\331\203\330\247\330\251 \331\205\330\255\330\252\331\210\331\211 \330\243\331\203\330\253\330\261 \331\210\330\247\331\202\330\271\331\212\330\251. <oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;test_skill_id_0&amp;quot;\" text-with-value=\"&amp;quot; \331\206\330\265 \331\205\330\271 \330\247\331\204\331\202\331\212\331\205\330\251 test_skill_id_0 concept card&amp;quot;\"></oppia-noninteractive-skillreview>. </p> <p> <oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;test_skill_id_1&amp;quot;\" text-with-value=\"&amp;quot; \331\206\330\265 \331\205\330\271 \330\247\331\204\331\202\331\212\331\205\330\251 test_skill_id_1 concept card&amp;quot;\"></oppia-noninteractive-skillreview></p>"
+        html: "<p> \331\210\330\265\331\201 subtopic \331\207\331\206\330\247. </p> <p> \331\207\330\260\330\247 \331\207\331\210 \331\206\331\205\331\210\330\260\330\254 subtopic \331\205\330\271 \331\205\330\255\330\252\331\210\331\211 \331\210\331\207\331\205\331\212\330\251 \331\204\330\247 \331\212\330\261\330\252\330\250\330\267 \330\250\330\243\331\212 \330\264\331\212\330\241 \330\271\331\204\331\211 \331\210\330\254\331\207 \330\247\331\204\330\256\330\265\331\210\330\265. \331\204\330\247\330\255\330\270 \330\243\331\206 \331\207\330\260\331\207 \331\201\331\202\330\261\330\247\330\252 \331\205\330\252\330\271\330\257\330\257\330\251 \331\205\330\255\330\247\331\203\330\247\330\251 \331\205\330\255\330\252\331\210\331\211 \330\243\331\203\330\253\330\261 \331\210\330\247\331\202\330\271\331\212\330\251. <oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;test_skill_id_0&amp;quot;\" text-with-value=\"&amp;quot; \331\206\330\265 \331\205\330\271 \330\247\331\204\331\202\331\212\331\205\330\251 test_skill_id_0 concept card&amp;quot;\"></oppia-noninteractive-skillreview>. </p> <p> <oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;test_skill_id_1&amp;quot;\" text-with-value=\"&amp;quot; \331\206\330\265 \331\205\330\271 \330\247\331\204\331\202\331\212\331\205\330\251 test_skill_id_1 concept card&amp;quot;\"></oppia-noninteractive-skillreview></p><p /><p />\331\202\330\247\330\246\331\205\330\251 \331\205\330\261\331\202\331\205\330\251 \331\205\330\271 \330\252\330\257\330\247\330\256\331\204 \330\271\331\205\331\212\331\202:<p /><p /><ol><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\243\331\210\331\204 \330\247\331\204\330\271\331\206\330\265\330\261 \330\247\331\204\330\243\331\210\331\204</li><li>\330\271\331\206\330\265\330\261 \330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\253\330\247\331\206\331\212 \331\205\330\271 \331\206\330\265 \330\267\331\210\331\212\331\204 \331\204\330\247\330\256\330\252\330\250\330\247\330\261 \330\247\331\204\330\252\331\201\330\247\331\201 \330\247\331\204\331\201\331\202\330\261\330\251. \330\254\331\205\330\271\330\252 \331\210\330\247\330\271\330\252\331\204\330\247\330\241 \330\253\331\205 \330\255\330\252\331\211. \330\252\330\247\330\261\331\212\330\256 \330\247\331\204\330\242\331\204\330\247\331\201 \331\210\330\247\331\204\330\257\331\212\331\210\331\206 \331\207\331\210 \330\252\330\255\330\252\330\214 \330\250\331\202\330\263\331\210\330\251 \330\247\331\204\330\260\331\210\330\257 \330\250\331\212\331\206. \331\205\331\206 \330\252\331\204\331\203 \331\210\330\262\330\247\330\261\330\251 \330\247\331\204\330\252\330\254\330\247\330\261\330\251. \330\247\331\204\330\250\330\261\331\212\330\251 \331\202\330\257 \330\271\330\257\330\257. \331\205\331\206\330\252\330\265\331\201 \330\247\331\204\330\252\330\256\330\267\331\212\330\267 \330\257\331\210\331\204 \331\201\331\212\330\214 \330\257\331\210\331\204 \330\271\330\261\331\201\331\207\330\247 \331\210\330\250\330\257\330\247\331\212\330\251 \331\243\331\240. \331\210\331\202\331\210\330\271\331\207\330\247 \330\214 \330\250\331\205\330\250\330\247\330\261\331\203\330\251 \331\210 \331\204\331\207\330\247.</li><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\253\330\247\331\204\330\253 \330\247\331\204\330\250\331\206\330\257 \330\247\331\204\330\253\330\247\331\204\330\253<ol><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\253\330\247\331\206\331\212 \330\214 \330\247\331\204\330\271\331\206\330\265\330\261 \330\247\331\204\330\243\331\210\331\204<ol><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\253\330\247\331\204\330\253 \330\214 \330\247\331\204\330\271\331\206\330\265\330\261 \330\247\331\204\330\243\331\210\331\204<ol><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\261\330\247\330\250\330\271 \330\214 \330\247\331\204\330\271\331\206\330\265\330\261 \330\247\331\204\330\243\331\210\331\204<ol><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\256\330\247\331\205\330\263 \330\214 \330\247\331\204\330\271\331\206\330\265\330\261 \330\247\331\204\330\243\331\210\331\204 \330\250\331\206\330\265 \330\267\331\210\331\212\331\204 \331\204\330\247\330\256\330\252\330\250\330\247\330\261 \330\247\331\204\330\252\331\201\330\247\331\201 \330\247\331\204\331\201\331\202\330\261\330\251. \330\254\331\205\330\271\330\252 \331\210\330\247\330\271\330\252\331\204\330\247\330\241 \330\253\331\205 \330\255\330\252\331\211. \330\252\330\247\330\261\331\212\330\256 \330\247\331\204\330\242\331\204\330\247\331\201 \331\210\330\247\331\204\330\257\331\212\331\210\331\206 \331\207\331\210 \330\252\330\255\330\252\330\214 \330\250\331\202\330\263\331\210\330\251 \330\247\331\204\330\260\331\210\330\257 \330\250\331\212\331\206. \331\205\331\206 \330\252\331\204\331\203 \331\210\330\262\330\247\330\261\330\251 \330\247\331\204\330\252\330\254\330\247\330\261\330\251. \330\247\331\204\330\250\330\261\331\212\330\251 \331\202\330\257 \330\271\330\257\330\257. \331\205\331\206\330\252\330\265\331\201 \330\247\331\204\330\252\330\256\330\267\331\212\330\267 \330\257\331\210\331\204 \331\201\331\212\330\214 \330\257\331\210\331\204 \330\271\330\261\331\201\331\207\330\247 \331\210\330\250\330\257\330\247\331\212\330\251 \331\243\331\240. \331\210\331\202\331\210\330\271\331\207\330\247 \330\214 \330\250\331\205\330\250\330\247\330\261\331\203\330\251 \331\210 \331\204\331\207\330\247.</li></ol></li></ol></li></ol></li><li>\330\271\331\206\330\265\330\261 \330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\253\330\247\331\206\331\212 \330\247\331\204\330\253\330\247\331\206\331\212<ol><li>\330\271\331\206\330\265\330\261 \330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\253\330\247\331\204\330\253 \330\247\331\204\330\253\330\247\331\206\331\212</li><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\253\330\247\331\204\330\253 \330\214 \330\247\331\204\330\271\331\206\330\265\330\261 \330\247\331\204\330\253\330\247\331\204\330\253</li><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\253\330\247\331\204\330\253 \330\214 \330\247\331\204\330\271\331\206\330\265\330\261 \330\247\331\204\330\261\330\247\330\250\330\271</li></ol></li></ol></li><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\261\330\247\330\250\330\271 \330\214 \330\247\331\204\330\250\331\206\330\257 \330\247\331\204\330\261\330\247\330\250\330\271</li><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\243\331\210\331\204 - \330\247\331\204\330\250\331\206\330\257 \330\247\331\204\330\256\330\247\331\205\330\263</li><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\243\331\210\331\204 \330\247\331\204\330\250\331\206\330\257 \330\247\331\204\330\263\330\247\330\257\330\263</li><li>\330\247\331\204\330\271\331\206\330\265\330\261 \330\247\331\204\330\263\330\247\330\250\330\271 \331\205\331\206 \330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\243\331\210\331\204</li><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\253\330\247\331\205\331\206 \330\247\331\204\330\250\331\206\330\257</li><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\243\331\210\331\204 \330\247\331\204\330\250\331\206\330\257 \330\247\331\204\330\252\330\247\330\263\330\271</li><li>\330\247\331\204\330\271\331\206\330\265\330\261 \330\247\331\204\330\271\330\247\330\264\330\261 \331\205\331\206 \330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\243\331\210\331\204</li><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\243\331\210\331\204 \330\214 \330\247\331\204\330\250\331\206\330\257 \330\247\331\204\330\255\330\247\330\257\331\212 \330\271\330\264\330\261</li><li>\330\247\331\204\330\250\331\206\330\257 \330\247\331\204\330\253\330\247\331\206\331\212 \330\271\330\264\330\261 \331\205\331\206 \330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\243\331\210\331\204</li><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\243\331\210\331\204 \330\214 \330\247\331\204\330\250\331\206\330\257 \330\247\331\204\330\253\330\247\331\204\330\253 \330\271\330\264\330\261</li></ol><p /><p />\331\202\330\247\330\246\331\205\330\251 \331\206\331\202\330\267\331\212\330\251 \331\205\330\271 \330\252\330\257\330\247\330\256\331\204 \330\271\331\205\331\212\331\202:<p /><p /><ul><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\243\331\210\331\204 \330\247\331\204\330\271\331\206\330\265\330\261 \330\247\331\204\330\243\331\210\331\204</li><li>\330\271\331\206\330\265\330\261 \330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\253\330\247\331\206\331\212 \331\205\330\271 \331\206\330\265 \330\267\331\210\331\212\331\204 \331\204\330\247\330\256\330\252\330\250\330\247\330\261 \330\247\331\204\330\252\331\201\330\247\331\201 \330\247\331\204\331\201\331\202\330\261\330\251. \330\254\331\205\330\271\330\252 \331\210\330\247\330\271\330\252\331\204\330\247\330\241 \330\253\331\205 \330\255\330\252\331\211. \330\252\330\247\330\261\331\212\330\256 \330\247\331\204\330\242\331\204\330\247\331\201 \331\210\330\247\331\204\330\257\331\212\331\210\331\206 \331\207\331\210 \330\252\330\255\330\252\330\214 \330\250\331\202\330\263\331\210\330\251 \330\247\331\204\330\260\331\210\330\257 \330\250\331\212\331\206. \331\205\331\206 \330\252\331\204\331\203 \331\210\330\262\330\247\330\261\330\251 \330\247\331\204\330\252\330\254\330\247\330\261\330\251. \330\247\331\204\330\250\330\261\331\212\330\251 \331\202\330\257 \330\271\330\257\330\257. \331\205\331\206\330\252\330\265\331\201 \330\247\331\204\330\252\330\256\330\267\331\212\330\267 \330\257\331\210\331\204 \331\201\331\212\330\214 \330\257\331\210\331\204 \330\271\330\261\331\201\331\207\330\247 \331\210\330\250\330\257\330\247\331\212\330\251 \331\243\331\240. \331\210\331\202\331\210\330\271\331\207\330\247 \330\214 \330\250\331\205\330\250\330\247\330\261\331\203\330\251 \331\210 \331\204\331\207\330\247.</li><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\253\330\247\331\204\330\253 \330\247\331\204\330\250\331\206\330\257 \330\247\331\204\330\253\330\247\331\204\330\253<ul><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\253\330\247\331\206\331\212 \330\214 \330\247\331\204\330\271\331\206\330\265\330\261 \330\247\331\204\330\243\331\210\331\204<ul><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\253\330\247\331\204\330\253 \330\214 \330\247\331\204\330\271\331\206\330\265\330\261 \330\247\331\204\330\243\331\210\331\204<ul><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\261\330\247\330\250\330\271 \330\214 \330\247\331\204\330\271\331\206\330\265\330\261 \330\247\331\204\330\243\331\210\331\204<ul><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\256\330\247\331\205\330\263 \330\214 \330\247\331\204\330\271\331\206\330\265\330\261 \330\247\331\204\330\243\331\210\331\204 \330\250\331\206\330\265 \330\267\331\210\331\212\331\204 \331\204\330\247\330\256\330\252\330\250\330\247\330\261 \330\247\331\204\330\252\331\201\330\247\331\201 \330\247\331\204\331\201\331\202\330\261\330\251. \330\254\331\205\330\271\330\252 \331\210\330\247\330\271\330\252\331\204\330\247\330\241 \330\253\331\205 \330\255\330\252\331\211. \330\252\330\247\330\261\331\212\330\256 \330\247\331\204\330\242\331\204\330\247\331\201 \331\210\330\247\331\204\330\257\331\212\331\210\331\206 \331\207\331\210 \330\252\330\255\330\252\330\214 \330\250\331\202\330\263\331\210\330\251 \330\247\331\204\330\260\331\210\330\257 \330\250\331\212\331\206. \331\205\331\206 \330\252\331\204\331\203 \331\210\330\262\330\247\330\261\330\251 \330\247\331\204\330\252\330\254\330\247\330\261\330\251. \330\247\331\204\330\250\330\261\331\212\330\251 \331\202\330\257 \330\271\330\257\330\257. \331\205\331\206\330\252\330\265\331\201 \330\247\331\204\330\252\330\256\330\267\331\212\330\267 \330\257\331\210\331\204 \331\201\331\212\330\214 \330\257\331\210\331\204 \330\271\330\261\331\201\331\207\330\247 \331\210\330\250\330\257\330\247\331\212\330\251 \331\243\331\240. \331\210\331\202\331\210\330\271\331\207\330\247 \330\214 \330\250\331\205\330\250\330\247\330\261\331\203\330\251 \331\210 \331\204\331\207\330\247.</li></ul></li></ul></li></ul></li><li>\330\271\331\206\330\265\330\261 \330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\253\330\247\331\206\331\212 \330\247\331\204\330\253\330\247\331\206\331\212<ul><li>\330\271\331\206\330\265\330\261 \330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\253\330\247\331\204\330\253 \330\247\331\204\330\253\330\247\331\206\331\212</li><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\253\330\247\331\204\330\253 \330\214 \330\247\331\204\330\271\331\206\330\265\330\261 \330\247\331\204\330\253\330\247\331\204\330\253</li><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\253\330\247\331\204\330\253 \330\214 \330\247\331\204\330\271\331\206\330\265\330\261 \330\247\331\204\330\261\330\247\330\250\330\271</li></ul></li></ul></li><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\261\330\247\330\250\330\271 \330\214 \330\247\331\204\330\250\331\206\330\257 \330\247\331\204\330\261\330\247\330\250\330\271</li></ul><p /><p />\331\202\330\247\330\246\331\205\330\251 \330\250\331\202\331\210\330\247\330\246\331\205 \331\205\330\261\331\202\331\205\330\251 / \331\206\331\202\330\267\331\212\330\251 \330\250\330\257\331\212\331\204\330\251 (\330\252\330\250\330\257\330\243 \330\250\330\247\331\204\330\243\330\261\331\202\330\247\331\205):<ol><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\243\331\210\331\204 \330\247\331\204\330\271\331\206\330\265\330\261 \330\247\331\204\330\243\331\210\331\204</li><li>\330\271\331\206\330\265\330\261 \330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\253\330\247\331\206\331\212 \331\205\330\271 \331\206\330\265 \330\267\331\210\331\212\331\204 \331\204\330\247\330\256\330\252\330\250\330\247\330\261 \330\247\331\204\330\252\331\201\330\247\331\201 \330\247\331\204\331\201\331\202\330\261\330\251. \330\254\331\205\330\271\330\252 \331\210\330\247\330\271\330\252\331\204\330\247\330\241 \330\253\331\205 \330\255\330\252\331\211. \330\252\330\247\330\261\331\212\330\256 \330\247\331\204\330\242\331\204\330\247\331\201 \331\210\330\247\331\204\330\257\331\212\331\210\331\206 \331\207\331\210 \330\252\330\255\330\252\330\214 \330\250\331\202\330\263\331\210\330\251 \330\247\331\204\330\260\331\210\330\257 \330\250\331\212\331\206. \331\205\331\206 \330\252\331\204\331\203 \331\210\330\262\330\247\330\261\330\251 \330\247\331\204\330\252\330\254\330\247\330\261\330\251. \330\247\331\204\330\250\330\261\331\212\330\251 \331\202\330\257 \330\271\330\257\330\257. \331\205\331\206\330\252\330\265\331\201 \330\247\331\204\330\252\330\256\330\267\331\212\330\267 \330\257\331\210\331\204 \331\201\331\212\330\214 \330\257\331\210\331\204 \330\271\330\261\331\201\331\207\330\247 \331\210\330\250\330\257\330\247\331\212\330\251 \331\243\331\240. \331\210\331\202\331\210\330\271\331\207\330\247 \330\214 \330\250\331\205\330\250\330\247\330\261\331\203\330\251 \331\210 \331\204\331\207\330\247.</li><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\253\330\247\331\204\330\253 \330\247\331\204\330\250\331\206\330\257 \330\247\331\204\330\253\330\247\331\204\330\253<ul><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\253\330\247\331\206\331\212 \330\214 \330\247\331\204\330\271\331\206\330\265\330\261 \330\247\331\204\330\243\331\210\331\204<ol><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\253\330\247\331\204\330\253 \330\214 \330\247\331\204\330\271\331\206\330\265\330\261 \330\247\331\204\330\243\331\210\331\204<ul><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\261\330\247\330\250\330\271 \330\214 \330\247\331\204\330\271\331\206\330\265\330\261 \330\247\331\204\330\243\331\210\331\204<ol><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\256\330\247\331\205\330\263 \330\214 \330\247\331\204\330\271\331\206\330\265\330\261 \330\247\331\204\330\243\331\210\331\204 \330\250\331\206\330\265 \330\267\331\210\331\212\331\204 \331\204\330\247\330\256\330\252\330\250\330\247\330\261 \330\247\331\204\330\252\331\201\330\247\331\201 \330\247\331\204\331\201\331\202\330\261\330\251. \330\254\331\205\330\271\330\252 \331\210\330\247\330\271\330\252\331\204\330\247\330\241 \330\253\331\205 \330\255\330\252\331\211. \330\252\330\247\330\261\331\212\330\256 \330\247\331\204\330\242\331\204\330\247\331\201 \331\210\330\247\331\204\330\257\331\212\331\210\331\206 \331\207\331\210 \330\252\330\255\330\252\330\214 \330\250\331\202\330\263\331\210\330\251 \330\247\331\204\330\260\331\210\330\257 \330\250\331\212\331\206. \331\205\331\206 \330\252\331\204\331\203 \331\210\330\262\330\247\330\261\330\251 \330\247\331\204\330\252\330\254\330\247\330\261\330\251. \330\247\331\204\330\250\330\261\331\212\330\251 \331\202\330\257 \330\271\330\257\330\257. \331\205\331\206\330\252\330\265\331\201 \330\247\331\204\330\252\330\256\330\267\331\212\330\267 \330\257\331\210\331\204 \331\201\331\212\330\214 \330\257\331\210\331\204 \330\271\330\261\331\201\331\207\330\247 \331\210\330\250\330\257\330\247\331\212\330\251 \331\243\331\240. \331\210\331\202\331\210\330\271\331\207\330\247 \330\214 \330\250\331\205\330\250\330\247\330\261\331\203\330\251 \331\210 \331\204\331\207\330\247.</li></ol></li></ul></li></ol></li><li>\330\271\331\206\330\265\330\261 \330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\253\330\247\331\206\331\212 \330\247\331\204\330\253\330\247\331\206\331\212<ol><li>\330\271\331\206\330\265\330\261 \330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\253\330\247\331\204\330\253 \330\247\331\204\330\253\330\247\331\206\331\212</li><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\253\330\247\331\204\330\253 \330\214 \330\247\331\204\330\271\331\206\330\265\330\261 \330\247\331\204\330\253\330\247\331\204\330\253</li><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\253\330\247\331\204\330\253 \330\214 \330\247\331\204\330\271\331\206\330\265\330\261 \330\247\331\204\330\261\330\247\330\250\330\271</li></ol></li></ul></li><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\261\330\247\330\250\330\271 \330\214 \330\247\331\204\330\250\331\206\330\257 \330\247\331\204\330\261\330\247\330\250\330\271</li></ol><p /><p />\331\202\330\247\330\246\331\205\330\251 \330\250\331\202\331\210\330\247\330\246\331\205 \330\260\330\247\330\252 \330\252\330\271\330\257\330\247\330\257 \330\261\331\202\331\205\331\212 / \330\252\330\271\330\257\330\247\330\257 \331\206\331\202\330\267\331\212 (\330\250\330\257\330\241\331\213\330\247 \331\205\331\206 \330\247\331\204\330\261\331\205\331\210\330\262 \330\247\331\204\331\206\331\202\330\267\331\212\330\251):<ul><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\243\331\210\331\204 \330\247\331\204\330\271\331\206\330\265\330\261 \330\247\331\204\330\243\331\210\331\204</li><li>\330\271\331\206\330\265\330\261 \330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\253\330\247\331\206\331\212 \331\205\330\271 \331\206\330\265 \330\267\331\210\331\212\331\204 \331\204\330\247\330\256\330\252\330\250\330\247\330\261 \330\247\331\204\330\252\331\201\330\247\331\201 \330\247\331\204\331\201\331\202\330\261\330\251. \330\254\331\205\330\271\330\252 \331\210\330\247\330\271\330\252\331\204\330\247\330\241 \330\253\331\205 \330\255\330\252\331\211. \330\252\330\247\330\261\331\212\330\256 \330\247\331\204\330\242\331\204\330\247\331\201 \331\210\330\247\331\204\330\257\331\212\331\210\331\206 \331\207\331\210 \330\252\330\255\330\252\330\214 \330\250\331\202\330\263\331\210\330\251 \330\247\331\204\330\260\331\210\330\257 \330\250\331\212\331\206. \331\205\331\206 \330\252\331\204\331\203 \331\210\330\262\330\247\330\261\330\251 \330\247\331\204\330\252\330\254\330\247\330\261\330\251. \330\247\331\204\330\250\330\261\331\212\330\251 \331\202\330\257 \330\271\330\257\330\257. \331\205\331\206\330\252\330\265\331\201 \330\247\331\204\330\252\330\256\330\267\331\212\330\267 \330\257\331\210\331\204 \331\201\331\212\330\214 \330\257\331\210\331\204 \330\271\330\261\331\201\331\207\330\247 \331\210\330\250\330\257\330\247\331\212\330\251 \331\243\331\240. \331\210\331\202\331\210\330\271\331\207\330\247 \330\214 \330\250\331\205\330\250\330\247\330\261\331\203\330\251 \331\210 \331\204\331\207\330\247.</li><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\253\330\247\331\204\330\253 \330\247\331\204\330\250\331\206\330\257 \330\247\331\204\330\253\330\247\331\204\330\253<ol><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\253\330\247\331\206\331\212 \330\214 \330\247\331\204\330\271\331\206\330\265\330\261 \330\247\331\204\330\243\331\210\331\204<ul><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\253\330\247\331\204\330\253 \330\214 \330\247\331\204\330\271\331\206\330\265\330\261 \330\247\331\204\330\243\331\210\331\204<ol><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\261\330\247\330\250\330\271 \330\214 \330\247\331\204\330\271\331\206\330\265\330\261 \330\247\331\204\330\243\331\210\331\204<ul><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\256\330\247\331\205\330\263 \330\214 \330\247\331\204\330\271\331\206\330\265\330\261 \330\247\331\204\330\243\331\210\331\204 \330\250\331\206\330\265 \330\267\331\210\331\212\331\204 \331\204\330\247\330\256\330\252\330\250\330\247\330\261 \330\247\331\204\330\252\331\201\330\247\331\201 \330\247\331\204\331\201\331\202\330\261\330\251. \330\254\331\205\330\271\330\252 \331\210\330\247\330\271\330\252\331\204\330\247\330\241 \330\253\331\205 \330\255\330\252\331\211. \330\252\330\247\330\261\331\212\330\256 \330\247\331\204\330\242\331\204\330\247\331\201 \331\210\330\247\331\204\330\257\331\212\331\210\331\206 \331\207\331\210 \330\252\330\255\330\252\330\214 \330\250\331\202\330\263\331\210\330\251 \330\247\331\204\330\260\331\210\330\257 \330\250\331\212\331\206. \331\205\331\206 \330\252\331\204\331\203 \331\210\330\262\330\247\330\261\330\251 \330\247\331\204\330\252\330\254\330\247\330\261\330\251. \330\247\331\204\330\250\330\261\331\212\330\251 \331\202\330\257 \330\271\330\257\330\257. \331\205\331\206\330\252\330\265\331\201 \330\247\331\204\330\252\330\256\330\267\331\212\330\267 \330\257\331\210\331\204 \331\201\331\212\330\214 \330\257\331\210\331\204 \330\271\330\261\331\201\331\207\330\247 \331\210\330\250\330\257\330\247\331\212\330\251 \331\243\331\240. \331\210\331\202\331\210\330\271\331\207\330\247 \330\214 \330\250\331\205\330\250\330\247\330\261\331\203\330\251 \331\210 \331\204\331\207\330\247.</li></ul></li></ol></li></ul></li><li>\330\271\331\206\330\265\330\261 \330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\253\330\247\331\206\331\212 \330\247\331\204\330\253\330\247\331\206\331\212<ul><li>\330\271\331\206\330\265\330\261 \330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\253\330\247\331\204\330\253 \330\247\331\204\330\253\330\247\331\206\331\212</li><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\253\330\247\331\204\330\253 \330\214 \330\247\331\204\330\271\331\206\330\265\330\261 \330\247\331\204\330\253\330\247\331\204\330\253</li><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\253\330\247\331\204\330\253 \330\214 \330\247\331\204\330\271\331\206\330\265\330\261 \330\247\331\204\330\261\330\247\330\250\330\271</li></ul></li></ol></li><li>\330\247\331\204\331\205\330\263\330\252\331\210\331\211 \330\247\331\204\330\261\330\247\330\250\330\271 \330\214 \330\247\331\204\330\250\331\206\330\257 \330\247\331\204\330\261\330\247\330\250\330\271</li></ul>"
       }
     }
     translation_mapping {
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 1fdee55e0a3..441349a37f2 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
@@ -24,6 +24,7 @@ import org.oppia.android.app.model.HelpIndex.IndexTypeCase.NEXT_AVAILABLE_HINT_I
 import org.oppia.android.app.model.HelpIndex.IndexTypeCase.SHOW_SOLUTION
 import org.oppia.android.app.model.ProfileId
 import org.oppia.android.app.model.UserAnswer
+import org.oppia.android.app.model.WrittenTranslationLanguageSelection
 import org.oppia.android.domain.classify.AnswerClassificationController
 import org.oppia.android.domain.exploration.ExplorationProgress.PlayStage.LOADING_EXPLORATION
 import org.oppia.android.domain.exploration.ExplorationProgress.PlayStage.NOT_PLAYING
@@ -42,6 +43,7 @@ import org.oppia.android.util.data.AsyncResult
 import org.oppia.android.util.data.DataProvider
 import org.oppia.android.util.data.DataProviders
 import org.oppia.android.util.data.DataProviders.Companion.combineWith
+import org.oppia.android.util.data.DataProviders.Companion.transform
 import org.oppia.android.util.system.OppiaClock
 import org.oppia.android.util.threading.BackgroundDispatcher
 import java.util.UUID
@@ -65,6 +67,8 @@ private const val MOVE_TO_NEXT_STATE_RESULT_PROVIDER_ID =
   "ExplorationProgressController.move_to_next_state_result"
 private const val CURRENT_STATE_PROVIDER_ID = "ExplorationProgressController.current_state"
 private const val LOCALIZED_STATE_PROVIDER_ID = "ExplorationProgressController.localized_state"
+private const val UPDATE_WRITTEN_TRANSLATION_CONTENT_PROVIDER_ID =
+  "ExplorationProgressController.update_written_translation_content"
 
 /**
  * A default session ID to be used before a session has been initialized.
@@ -382,6 +386,34 @@ class ExplorationProgressController @Inject constructor(
     }
   }
 
+  /**
+   * Updates the current written content language for the specified [profileId] and [selection]
+   * mid-lesson.
+   *
+   * See [TranslationController.updateWrittenTranslationContentLanguage] for specifics.
+   *
+   * Note that this function should be used for special-cased in-lesson language switching (that is,
+   * language switching that's only enabled via a per-profile setting and as part of a user study).
+   *
+   * @return a [DataProvider] that indicates the success/failure of attempting to update the content
+   *     language
+   */
+  fun updateWrittenTranslationContentLanguageMidLesson(
+    profileId: ProfileId,
+    selection: WrittenTranslationLanguageSelection
+  ): DataProvider<Any> {
+    return translationController.updateWrittenTranslationContentLanguage(
+      profileId, selection
+    ).transform(UPDATE_WRITTEN_TRANSLATION_CONTENT_PROVIDER_ID) { previousSelection ->
+      val explorationLogger = learnerAnalyticsLogger.explorationAnalyticsLogger.value
+      val stateLogger = explorationLogger?.stateAnalyticsLogger?.value
+      stateLogger?.logSwitchInLessonLanguage(
+        fromLanguage = previousSelection.selectedLanguage,
+        toLanguage = selection.selectedLanguage
+      ) ?: Unit
+    }
+  }
+
   private fun createControllerCommandActor(): SendChannel<ControllerMessage<*>> {
     lateinit var controllerState: ControllerState
 
@@ -415,6 +447,7 @@ class ExplorationProgressController @Inject constructor(
                   message.ephemeralStateFlow,
                   commandQueue,
                   installationId,
+                  message.profileId,
                   learnerId,
                   learnerAnalyticsLogger,
                   startSessionTimeMs = oppiaClock.getCurrentTimeMs(),
@@ -1058,6 +1091,7 @@ class ExplorationProgressController @Inject constructor(
     val ephemeralStateFlow: MutableStateFlow<AsyncResult<EphemeralState>>,
     val commandQueue: SendChannel<ControllerMessage<*>>,
     private val installationId: String?,
+    private val profileId: ProfileId,
     private val learnerId: String?,
     private val learnerAnalyticsLogger: LearnerAnalyticsLogger,
     val startSessionTimeMs: Long,
@@ -1096,6 +1130,7 @@ class ExplorationProgressController @Inject constructor(
     fun initializeEventLogger(exploration: Exploration) {
       explorationAnalyticsLogger = learnerAnalyticsLogger.beginExploration(
         installationId,
+        profileId,
         learnerId,
         exploration,
         explorationProgress.currentTopicId,
@@ -1152,10 +1187,10 @@ class ExplorationProgressController @Inject constructor(
         // new HelpIndex indicates its previous state and therefore what changed.
         when (newHelpIndex.indexTypeCase) {
           NEXT_AVAILABLE_HINT_INDEX ->
-            stateAnalyticsLogger?.logHintOffered(newHelpIndex.nextAvailableHintIndex)
+            stateAnalyticsLogger?.logHintUnlocked(newHelpIndex.nextAvailableHintIndex)
           LATEST_REVEALED_HINT_INDEX ->
             stateAnalyticsLogger?.logViewHint(newHelpIndex.latestRevealedHintIndex)
-          SHOW_SOLUTION -> stateAnalyticsLogger?.logSolutionOffered()
+          SHOW_SOLUTION -> stateAnalyticsLogger?.logSolutionUnlocked()
           EVERYTHING_REVEALED -> when (helpIndex.indexTypeCase) {
             SHOW_SOLUTION -> stateAnalyticsLogger?.logViewSolution()
             NEXT_AVAILABLE_HINT_INDEX -> // No solution, so revealing the hint ends available help.
diff --git a/domain/src/main/java/org/oppia/android/domain/oppialogger/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/oppialogger/BUILD.bazel
index b59a8992ace..9126d713ce0 100644
--- a/domain/src/main/java/org/oppia/android/domain/oppialogger/BUILD.bazel
+++ b/domain/src/main/java/org/oppia/android/domain/oppialogger/BUILD.bazel
@@ -23,7 +23,6 @@ kt_android_library(
     ],
     visibility = ["//domain:__subpackages__"],
     deps = [
-        "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:controller",
         "//model/src/main/proto:event_logger_java_proto_lite",
         "//utility/src/main/java/org/oppia/android/util/logging:console_logger",
     ],
diff --git a/domain/src/main/java/org/oppia/android/domain/oppialogger/LoggingIdentifierController.kt b/domain/src/main/java/org/oppia/android/domain/oppialogger/LoggingIdentifierController.kt
index ca4a741da2d..5ce84fc4bcf 100644
--- a/domain/src/main/java/org/oppia/android/domain/oppialogger/LoggingIdentifierController.kt
+++ b/domain/src/main/java/org/oppia/android/domain/oppialogger/LoggingIdentifierController.kt
@@ -89,7 +89,7 @@ class LoggingIdentifierController @Inject constructor(
   /**
    * Returns an in-memory data provider pointing to a class variable of [sessionId].
    *
-   * This ID is unique to each session. A session starts when an exploration begins.
+   * This ID is unique to each session. A session starts when a learner logs in.
    */
   fun getSessionId(): DataProvider<String> = sessionIdDataProvider
 
@@ -106,7 +106,7 @@ class LoggingIdentifierController @Inject constructor(
    * Regenerates [sessionId] and notifies the data provider.
    *
    * The [sessionId] is generally updated when:
-   *  1. An exploration is started/resumed/started-over.
+   *  1. A learner logs into their profile.
    *  2. Inactivity duration exceeds the maximum time limit for an active session.
    */
   fun updateSessionId() {
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 12ff9e6a5c2..d8a1cee8075 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
@@ -1,22 +1,12 @@
 package org.oppia.android.domain.oppialogger
 
 import org.oppia.android.app.model.EventLog
-import org.oppia.android.domain.oppialogger.analytics.AnalyticsController
+import org.oppia.android.app.model.EventLog.RevisionCardContext
 import org.oppia.android.util.logging.ConsoleLogger
-import org.oppia.android.util.system.OppiaClock
 import javax.inject.Inject
 
 /** Logger that handles general-purpose logging throughout the domain & UI layers. */
-class OppiaLogger @Inject constructor(
-  private val analyticsController: AnalyticsController,
-  private val consoleLogger: ConsoleLogger,
-  private val oppiaClock: OppiaClock
-) {
-  /** Logs high-priority events. See [AnalyticsController.logImportantEvent] for more context. */
-  fun logImportantEvent(eventContext: EventLog.Context) {
-    analyticsController.logImportantEvent(oppiaClock.getCurrentTimeMs(), eventContext)
-  }
-
+class OppiaLogger @Inject constructor(private val consoleLogger: ConsoleLogger) {
   /** Logs a verbose message with the specified tag. See [ConsoleLogger.v] for more context */
   fun v(tag: String, msg: String) {
     consoleLogger.v(tag, msg)
@@ -204,18 +194,24 @@ class OppiaLogger @Inject constructor(
       .build()
   }
 
-  /** Returns the context of the event indicating that the user opened the revision card. */
-  fun createOpenRevisionCardContext(
-    topicId: String,
-    subTopicId: Int
-  ): EventLog.Context {
-    return EventLog.Context.newBuilder()
-      .setOpenRevisionCard(
-        EventLog.RevisionCardContext.newBuilder()
-          .setTopicId(topicId)
-          .setSubTopicId(subTopicId)
-          .build()
-      )
-      .build()
+  /** Returns the context of the event indicating that the user opened a revision card. */
+  fun createOpenRevisionCardContext(topicId: String, subtopicIndex: Int): EventLog.Context {
+    return EventLog.Context.newBuilder().apply {
+      openRevisionCard = createRevisionCardContext(topicId, subtopicIndex)
+    }.build()
+  }
+
+  /** Returns the context of the event indicating that the user closed a revision card. */
+  fun createCloseRevisionCardContext(topicId: String, subtopicIndex: Int): EventLog.Context {
+    return EventLog.Context.newBuilder().apply {
+      closeRevisionCard = createRevisionCardContext(topicId, subtopicIndex)
+    }.build()
+  }
+
+  private fun createRevisionCardContext(topicId: String, subtopicIndex: Int): RevisionCardContext {
+    return RevisionCardContext.newBuilder().apply {
+      this.topicId = topicId
+      this.subTopicId = subtopicIndex
+    }.build()
   }
 }
diff --git a/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsController.kt b/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsController.kt
index 32cf3a14f47..4f5ab532094 100644
--- a/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsController.kt
+++ b/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsController.kt
@@ -1,10 +1,16 @@
 package org.oppia.android.domain.oppialogger.analytics
 
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.async
 import org.oppia.android.app.model.EventLog
 import org.oppia.android.app.model.EventLog.Priority
 import org.oppia.android.app.model.OppiaEventLogs
+import org.oppia.android.app.model.ProfileId
 import org.oppia.android.data.persistence.PersistentCacheStore
 import org.oppia.android.domain.oppialogger.EventLogStorageCacheSize
+import org.oppia.android.domain.translation.TranslationController
+import org.oppia.android.util.data.AsyncResult
 import org.oppia.android.util.data.DataProvider
 import org.oppia.android.util.logging.AnalyticsEventLogger
 import org.oppia.android.util.logging.ConsoleLogger
@@ -12,6 +18,8 @@ import org.oppia.android.util.logging.ExceptionLogger
 import org.oppia.android.util.logging.SyncStatusManager
 import org.oppia.android.util.networking.NetworkConnectionUtil
 import org.oppia.android.util.networking.NetworkConnectionUtil.ProdConnectionStatus.NONE
+import org.oppia.android.util.system.OppiaClock
+import org.oppia.android.util.threading.BlockingDispatcher
 import java.lang.IllegalStateException
 import javax.inject.Inject
 
@@ -28,7 +36,10 @@ class AnalyticsController @Inject constructor(
   private val networkConnectionUtil: NetworkConnectionUtil,
   private val exceptionLogger: ExceptionLogger,
   private val syncStatusManager: SyncStatusManager,
-  @EventLogStorageCacheSize private val eventLogStorageCacheSize: Int
+  private val oppiaClock: OppiaClock,
+  private val translationController: TranslationController,
+  @EventLogStorageCacheSize private val eventLogStorageCacheSize: Int,
+  @BlockingDispatcher private val blockingDispatcher: CoroutineDispatcher
 ) {
   private val eventLogStore =
     cacheStoreFactory.create("event_logs", OppiaEventLogs.getDefaultInstance())
@@ -42,8 +53,22 @@ class AnalyticsController @Inject constructor(
    * This method should only be used for events which are important to log and should be prioritized
    * over events logged via [logLowPriorityEvent].
    */
-  fun logImportantEvent(timestamp: Long, eventContext: EventLog.Context) {
-    uploadOrCacheEventLog(createEventLog(timestamp, eventContext, Priority.ESSENTIAL))
+  fun logImportantEvent(
+    eventContext: EventLog.Context,
+    profileId: ProfileId?,
+    timestamp: Long = oppiaClock.getCurrentTimeMs()
+  ) {
+    CoroutineScope(blockingDispatcher).async {
+      uploadOrCacheEventLog(createEventLog(profileId, timestamp, eventContext, Priority.ESSENTIAL))
+    }.invokeOnCompletion { failure ->
+      failure?.let {
+        consoleLogger.e(
+          "AnalyticsController",
+          "Failed to upload or cache important event: $eventContext (at time $timestamp).",
+          it
+        )
+      }
+    }
   }
 
   /**
@@ -59,12 +84,27 @@ class AnalyticsController @Inject constructor(
    * it's unexpected for events to actually be dropped since the app is configured to support a
    * large number of cached events at one time).
    */
-  fun logLowPriorityEvent(timestamp: Long, eventContext: EventLog.Context) {
-    uploadOrCacheEventLog(createEventLog(timestamp, eventContext, Priority.OPTIONAL))
+  fun logLowPriorityEvent(
+    eventContext: EventLog.Context,
+    profileId: ProfileId?,
+    timestamp: Long = oppiaClock.getCurrentTimeMs()
+  ) {
+    CoroutineScope(blockingDispatcher).async {
+      uploadOrCacheEventLog(createEventLog(profileId, timestamp, eventContext, Priority.OPTIONAL))
+    }.invokeOnCompletion { failure ->
+      failure?.let {
+        consoleLogger.w(
+          "AnalyticsController",
+          "Failed to upload or cache low-priority event: $eventContext (at time $timestamp).",
+          it
+        )
+      }
+    }
   }
 
   /** Returns an event log containing relevant data for event reporting. */
-  private fun createEventLog(
+  private suspend fun createEventLog(
+    profileId: ProfileId?,
     timestamp: Long,
     context: EventLog.Context,
     priority: Priority
@@ -73,11 +113,20 @@ class AnalyticsController @Inject constructor(
       this.timestamp = timestamp
       this.priority = priority
       this.context = context
+      resolveProfileOperation(
+        profileId, translationController::getAppLanguageSelection
+      )?.let { this.appLanguageSelection = it }
+      resolveProfileOperation(
+        profileId, translationController::getWrittenTranslationContentLanguageSelection
+      )?.let { this.writtenTranslationLanguageSelection = it }
+      resolveProfileOperation(
+        profileId, translationController::getAudioTranslationContentLanguageSelection
+      )?.let { this.audioTranslationLanguageSelection = it }
     }.build()
   }
 
   /** Either uploads or caches [eventLog] depending on current internet connectivity. */
-  private fun uploadOrCacheEventLog(eventLog: EventLog) {
+  private suspend fun uploadOrCacheEventLog(eventLog: EventLog) {
     when (networkConnectionUtil.getCurrentConnectionStatus()) {
       NONE -> {
         syncStatusManager.setSyncStatus(SyncStatusManager.SyncStatus.NO_CONNECTIVITY)
@@ -98,7 +147,7 @@ class AnalyticsController @Inject constructor(
    * limit is exceeded then the least recent event is removed from the [eventLogStore]. After this,
    * the [eventLog] is added to the store.
    */
-  private fun cacheEventLog(eventLog: EventLog) {
+  private suspend fun cacheEventLog(eventLog: EventLog) {
     eventLogStore.storeDataAsync(updateInMemoryCache = true) { oppiaEventLogs ->
       val storeSize = oppiaEventLogs.eventLogList.size
       if (storeSize + 1 > eventLogStorageCacheSize) {
@@ -117,9 +166,7 @@ class AnalyticsController @Inject constructor(
         }
       }
       return@storeDataAsync oppiaEventLogs.toBuilder().addEventLog(eventLog).build()
-    }.invokeOnCompletion {
-      it?.let { consoleLogger.e("AnalyticsController", "Failed to store event log.", it) }
-    }
+    }.await()
   }
 
   /**
@@ -162,4 +209,15 @@ class AnalyticsController @Inject constructor(
       it?.let { consoleLogger.e("AnalyticsController", "Failed to remove event log.", it) }
     }
   }
+
+  private companion object {
+    private suspend fun <T> resolveProfileOperation(
+      profileId: ProfileId?,
+      createProvider: (ProfileId) -> DataProvider<T>
+    ): T? {
+      return profileId?.let {
+        (createProvider(it).retrieveData() as? AsyncResult.Success<T>)?.value
+      }
+    }
+  }
 }
diff --git a/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/ApplicationLifecycleObserver.kt b/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/ApplicationLifecycleObserver.kt
index 0b38a58e7b4..236610c7aa6 100644
--- a/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/ApplicationLifecycleObserver.kt
+++ b/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/ApplicationLifecycleObserver.kt
@@ -10,6 +10,7 @@ import androidx.lifecycle.ProcessLifecycleOwner
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
+import org.oppia.android.app.model.ProfileId
 import org.oppia.android.app.model.ScreenName
 import org.oppia.android.app.model.ScreenName.BACKGROUND_SCREEN
 import org.oppia.android.app.model.ScreenName.FOREGROUND_SCREEN
@@ -129,11 +130,12 @@ class ApplicationLifecycleObserver @Inject constructor(
     currentScreen = BACKGROUND_SCREEN
   }
 
-  private fun logAppLifecycleEventInBackground(logMethod: (String?, String?) -> Unit) {
+  private fun logAppLifecycleEventInBackground(logMethod: (String?, ProfileId?, String?) -> Unit) {
     CoroutineScope(backgroundDispatcher).launch {
       val installationId = loggingIdentifierController.fetchInstallationId()
+      val profileId = profileManagementController.getCurrentProfileId()
       val learnerId = profileManagementController.fetchCurrentLearnerId()
-      logMethod(installationId, learnerId)
+      logMethod(installationId, profileId, learnerId)
     }.invokeOnCompletion { failure ->
       if (failure != null) {
         oppiaLogger.e(
diff --git a/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel
index 65f715b2289..98355aab203 100644
--- a/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel
+++ b/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel
@@ -26,6 +26,7 @@ kt_android_library(
         ":dagger",
         "//data/src/main/java/org/oppia/android/data/persistence:cache_store",
         "//domain/src/main/java/org/oppia/android/domain/oppialogger:prod_module",
+        "//domain/src/main/java/org/oppia/android/domain/translation:translation_controller",
         "//model/src/main/proto:event_logger_java_proto_lite",
         "//utility/src/main/java/org/oppia/android/util/data:data_provider",
         "//utility/src/main/java/org/oppia/android/util/logging:console_logger",
@@ -65,6 +66,7 @@ kt_android_library(
         ":dagger",
         "//domain/src/main/java/org/oppia/android/domain/oppialogger:logging_identifier_controller",
         "//domain/src/main/java/org/oppia/android/domain/oppialogger:oppia_logger",
+        "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:controller",
         "//model/src/main/proto:event_logger_java_proto_lite",
         "//model/src/main/proto:exploration_checkpoint_java_proto_lite",
     ],
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 d30bf80de40..01df824adb5 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
@@ -3,6 +3,7 @@ package org.oppia.android.domain.oppialogger.analytics
 import com.google.protobuf.MessageLite
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import org.oppia.android.app.model.EventLog
 import org.oppia.android.app.model.EventLog.CardContext
 import org.oppia.android.app.model.EventLog.ExplorationContext
 import org.oppia.android.app.model.EventLog.HintContext
@@ -12,6 +13,8 @@ import org.oppia.android.app.model.EventLog.SubmitAnswerContext
 import org.oppia.android.app.model.Exploration
 import org.oppia.android.app.model.Interaction
 import org.oppia.android.app.model.InteractionObject
+import org.oppia.android.app.model.OppiaLanguage
+import org.oppia.android.app.model.ProfileId
 import org.oppia.android.app.model.State
 import org.oppia.android.app.model.UserAnswer
 import org.oppia.android.domain.oppialogger.LoggingIdentifierController
@@ -37,6 +40,7 @@ import org.oppia.android.app.model.EventLog.Context.Builder as EventBuilder
 @Singleton
 class LearnerAnalyticsLogger @Inject constructor(
   private val oppiaLogger: OppiaLogger,
+  private val analyticsController: AnalyticsController,
   private val loggingIdentifierController: LoggingIdentifierController
 ) {
   /**
@@ -59,6 +63,7 @@ class LearnerAnalyticsLogger @Inject constructor(
    *
    * @param installationId the device installation ID corresponding to the new play session, or null
    *     if not known (which may impact whether events are logged)
+   * @param profileId the ID of the Oppia profile starting the new exploration session
    * @param learnerId the personal profile/learner ID corresponding to the new session learner, or
    *     null if not known (which may impact whether events are logged)
    * @param exploration the [Exploration] for which a play session is starting
@@ -67,6 +72,7 @@ class LearnerAnalyticsLogger @Inject constructor(
    */
   fun beginExploration(
     installationId: String?,
+    profileId: ProfileId,
     learnerId: String?,
     exploration: Exploration,
     topicId: String,
@@ -74,12 +80,14 @@ class LearnerAnalyticsLogger @Inject constructor(
   ): ExplorationAnalyticsLogger {
     return ExplorationAnalyticsLogger(
       installationId,
+      profileId,
       learnerId,
       topicId,
       storyId,
       exploration.id,
       exploration.version,
       oppiaLogger,
+      analyticsController,
       loggingIdentifierController
     ).also {
       if (!mutableExpAnalyticsLogger.compareAndSet(expect = null, update = it)) {
@@ -112,14 +120,17 @@ class LearnerAnalyticsLogger @Inject constructor(
    *
    * @param installationId the device installation ID corresponding to the new play session, or null
    *     if not known (which may impact whether the event is logged)
+   * @param profileId the ID of the Oppia profile currently logged in, or null if none
    * @param learnerId the personal profile/learner ID corresponding to the new session learner, or
    *     null if not known (which may impact whether the event is logged)
    */
-  fun logAppInBackground(installationId: String?, learnerId: String?) {
+  fun logAppInBackground(installationId: String?, profileId: ProfileId?, learnerId: String?) {
     val learnerDetailsContext = createLearnerDetailsContextWithIdsPresent(installationId, learnerId)
-    oppiaLogger.maybeLogEvent(
+    analyticsController.maybeLogEvent(
       installationId,
-      createAnalyticsEvent(learnerDetailsContext, EventBuilder::setAppInBackgroundContext)
+      createAnalyticsEvent(learnerDetailsContext, EventBuilder::setAppInBackgroundContext),
+      profileId,
+      oppiaLogger
     )
   }
 
@@ -128,14 +139,17 @@ class LearnerAnalyticsLogger @Inject constructor(
    *
    * @param installationId the device installation ID corresponding to the new play session, or null
    *     if not known (which may impact whether the event is logged)
+   * @param profileId the ID of the Oppia profile currently logged in, or null if none
    * @param learnerId the personal profile/learner ID corresponding to the new session learner, or
    *     null if not known (which may impact whether the event is logged)
    */
-  fun logAppInForeground(installationId: String?, learnerId: String?) {
+  fun logAppInForeground(installationId: String?, profileId: ProfileId?, learnerId: String?) {
     val learnerDetailsContext = createLearnerDetailsContextWithIdsPresent(installationId, learnerId)
-    oppiaLogger.maybeLogEvent(
+    analyticsController.maybeLogEvent(
       installationId,
-      createAnalyticsEvent(learnerDetailsContext, EventBuilder::setAppInForegroundContext)
+      createAnalyticsEvent(learnerDetailsContext, EventBuilder::setAppInForegroundContext),
+      profileId,
+      oppiaLogger
     )
   }
 
@@ -145,14 +159,18 @@ class LearnerAnalyticsLogger @Inject constructor(
    *
    * @param installationId the device installation ID corresponding to the new play session, or null
    *     if not known (which may impact whether the event is logged)
+   * @param profileId the ID of the Oppia profile deleting a profile, or null if no profiles are
+   *     currently logged in
    * @param learnerId the personal profile/learner ID corresponding to the new session learner, or
    *     null if not known (which may impact whether the event is logged)
    */
-  fun logDeleteProfile(installationId: String?, learnerId: String?) {
+  fun logDeleteProfile(installationId: String?, profileId: ProfileId?, learnerId: String?) {
     val learnerDetailsContext = createLearnerDetailsContextWithIdsPresent(installationId, learnerId)
-    oppiaLogger.maybeLogEvent(
+    analyticsController.maybeLogEvent(
       installationId,
-      createAnalyticsEvent(learnerDetailsContext, EventBuilder::setDeleteProfileContext)
+      createAnalyticsEvent(learnerDetailsContext, EventBuilder::setDeleteProfileContext),
+      profileId,
+      oppiaLogger
     )
   }
 
@@ -165,12 +183,14 @@ class LearnerAnalyticsLogger @Inject constructor(
    */
   class ExplorationAnalyticsLogger internal constructor(
     installationId: String?,
+    profileId: ProfileId,
     learnerId: String?,
     topicId: String,
     storyId: String,
     explorationId: String,
     explorationVersion: Int,
     private val oppiaLogger: OppiaLogger,
+    private val analyticsController: AnalyticsController,
     private val loggingIdentifierController: LoggingIdentifierController
   ) {
     /**
@@ -181,7 +201,9 @@ class LearnerAnalyticsLogger @Inject constructor(
 
     private val mutableStateAnalyticsLogger = MutableStateFlow<StateAnalyticsLogger?>(null)
 
-    private val baseLogger by lazy { BaseLogger(oppiaLogger, installationId) }
+    private val baseLogger by lazy {
+      BaseLogger(oppiaLogger, analyticsController, profileId, installationId)
+    }
     private val learnerDetailsContext by lazy {
       createLearnerDetailsContext(installationId, learnerId)
     }
@@ -294,9 +316,9 @@ class LearnerAnalyticsLogger @Inject constructor(
       logStateEvent(linkedSkillId, ::createCardContext, EventBuilder::setEndCardContext)
     }
 
-    /** Logs that the hint corresponding to [hintIndex] has been offered to the learner. */
-    fun logHintOffered(hintIndex: Int) {
-      logStateEvent(hintIndex, ::createHintContext, EventBuilder::setHintOfferedContext)
+    /** Logs that the hint corresponding to [hintIndex] has been unlocked by the learner. */
+    fun logHintUnlocked(hintIndex: Int) {
+      logStateEvent(hintIndex, ::createHintContext, EventBuilder::setHintUnlockedContext)
     }
 
     /** Logs that the hint corresponding to [hintIndex] has been viewed by the learner. */
@@ -304,9 +326,9 @@ class LearnerAnalyticsLogger @Inject constructor(
       logStateEvent(hintIndex, ::createHintContext, EventBuilder::setAccessHintContext)
     }
 
-    /** Logs that the solution to the current card has been offered to the learner. */
-    fun logSolutionOffered() {
-      logStateEvent(EventBuilder::setSolutionOfferedContext)
+    /** Logs that the solution to the current card has been unlocked by the learner. */
+    fun logSolutionUnlocked() {
+      logStateEvent(EventBuilder::setSolutionUnlockedContext)
     }
 
     /** Logs that the solution to the current card has been viewed by the learner. */
@@ -409,6 +431,19 @@ class LearnerAnalyticsLogger @Inject constructor(
       logStateEvent(EventBuilder::setReachInvestedEngagement)
     }
 
+    /**
+     * Logs that the learner has switched an ongoing lesson's content language from the language
+     * indicated by [fromLanguage] to the language indicated by [toLanguage].
+     */
+    fun logSwitchInLessonLanguage(fromLanguage: OppiaLanguage, toLanguage: OppiaLanguage) {
+      logStateEvent(
+        fromLanguage,
+        toLanguage,
+        ::createSwitchInLessonLanguageContext,
+        EventBuilder::setSwitchInLessonLanguage
+      )
+    }
+
     private fun logStateEvent(setter: EventBuilder.(ExplorationContext) -> EventBuilder) =
       logStateEvent(Unit, { _, context -> context }, setter)
 
@@ -457,6 +492,8 @@ class LearnerAnalyticsLogger @Inject constructor(
    */
   internal class BaseLogger internal constructor(
     private val oppiaLogger: OppiaLogger,
+    private val analyticsController: AnalyticsController,
+    private val profileId: ProfileId,
     private val installationId: String?
   ) {
     /**
@@ -478,24 +515,30 @@ class LearnerAnalyticsLogger @Inject constructor(
       )
     }
 
-    /** See [OppiaLogger.maybeLogEvent]. */
-    fun maybeLogEvent(context: EventContext?) = oppiaLogger.maybeLogEvent(installationId, context)
+    /** See [AnalyticsController.maybeLogEvent]. */
+    fun maybeLogEvent(context: EventContext?) =
+      analyticsController.maybeLogEvent(installationId, context, profileId, oppiaLogger)
 
     internal companion object {
       /**
-       * Conditionally logs the event specified by [context] for the provided [installationId] in
-       * this logger if [context] is not null, otherwise logs an error analytics event for error
-       * tracking in the analytics pipeline.
+       * Conditionally logs the event specified by [context] for the provided [installId] in this
+       * logger if [context] is not null, otherwise logs an error analytics event for error tracking
+       * in the analytics pipeline.
        */
-      internal fun OppiaLogger.maybeLogEvent(installationId: String?, context: EventContext?) {
+      internal fun AnalyticsController.maybeLogEvent(
+        installId: String?,
+        context: EventContext?,
+        profileId: ProfileId?,
+        oppiaLogger: OppiaLogger
+      ) {
         if (context != null) {
-          logImportantEvent(context)
+          logImportantEvent(context, profileId)
         } else {
-          this.e(
+          oppiaLogger.e(
             "LearnerAnalyticsLogger",
             "Event is being dropped due to incomplete event (or missing learner ID for profile)."
           )
-          logImportantEvent(createFailedToLogLearnerAnalyticsEvent(installationId))
+          logImportantEvent(createFailedToLogLearnerAnalyticsEvent(installId), profileId)
         }
       }
     }
@@ -562,6 +605,16 @@ class LearnerAnalyticsLogger @Inject constructor(
       this.explorationDetails = explorationDetails
     }.build()
 
+    private fun createSwitchInLessonLanguageContext(
+      fromLanguage: OppiaLanguage,
+      toLanguage: OppiaLanguage,
+      explorationDetails: ExplorationContext
+    ) = EventLog.SwitchInLessonLanguageEventContext.newBuilder().apply {
+      switchFromLanguage = fromLanguage
+      switchToLanguage = toLanguage
+      this.explorationDetails = explorationDetails
+    }.build()
+
     private fun <T> createAnalyticsEvent(
       baseContext: T,
       setter: EventBuilder.(T) -> EventContext.Builder
diff --git a/domain/src/main/java/org/oppia/android/domain/profile/ProfileManagementController.kt b/domain/src/main/java/org/oppia/android/domain/profile/ProfileManagementController.kt
index 2c581c2a2c1..2d19e1acc3e 100644
--- a/domain/src/main/java/org/oppia/android/domain/profile/ProfileManagementController.kt
+++ b/domain/src/main/java/org/oppia/android/domain/profile/ProfileManagementController.kt
@@ -39,6 +39,7 @@ import java.io.FileOutputStream
 import javax.inject.Inject
 import javax.inject.Singleton
 
+private const val DEFAULT_LOGGED_OUT_INTERNAL_PROFILE_ID = -1
 private const val GET_PROFILES_PROVIDER_ID = "get_profiles_provider_id"
 private const val GET_PROFILE_PROVIDER_ID = "get_profile_provider_id"
 private const val GET_WAS_PROFILE_EVER_ADDED_PROVIDER_ID =
@@ -57,6 +58,7 @@ private const val UPDATE_TOPIC_AUTOMATICALLY_PERMISSION_DEVICE_SETTINGS_PROVIDER
 private const val UPDATE_ALL_DOWNLOAD_ACCESS_PROVIDER_ID =
   "update_all_download_provider_id"
 private const val LOGIN_TO_PROFILE_PROVIDER_ID = "login_to_profile_provider_id"
+private const val UPDATE_SESSION_ID_PROVIDER_ID = "update_session_id_after_login_provider_id"
 private const val DELETE_PROFILE_PROVIDER_ID = "delete_profile_provider_id"
 private const val SET_CURRENT_PROFILE_ID_PROVIDER_ID = "set_current_profile_id_provider_id"
 private const val UPDATE_READING_TEXT_SIZE_PROVIDER_ID =
@@ -83,7 +85,7 @@ class ProfileManagementController @Inject constructor(
   private val enableLearnerStudyAnalytics: PlatformParameterValue<Boolean>,
   private val profileNameValidator: ProfileNameValidator
 ) {
-  private var currentProfileId: Int = -1
+  private var currentProfileId: Int = DEFAULT_LOGGED_OUT_INTERNAL_PROFILE_ID
   private val profileDataStore =
     cacheStoreFactory.create("profile_database", ProfileDatabase.getDefaultInstance())
 
@@ -96,9 +98,6 @@ class ProfileManagementController @Inject constructor(
   /** Indicates that the selected image was not stored properly. */
   class FailedToStoreImageException(msg: String) : Exception(msg)
 
-  /** Indicates that the gravatar url was not formed properly. */
-  class FailedToGenerateGravatarException(msg: String) : Exception(msg)
-
   /** Indicates that the profile's directory was not delete properly. */
   class FailedToDeleteDirException(msg: String) : Exception(msg)
 
@@ -115,20 +114,47 @@ class ProfileManagementController @Inject constructor(
   class DeviceSettingsNotFoundException(msg: String) : Exception(msg)
 
   /**
-   * These Statuses correspond to the exceptions above such that if the deferred contains
+   * These statuses correspond to the exceptions above such that if the deferred contains
    * PROFILE_NOT_FOUND, the [ProfileNotFoundException] will be passed to a failed AsyncResult.
-   *
-   * SUCCESS corresponds to a successful AsyncResult.
    */
   private enum class ProfileActionStatus {
+    /** Indicates that the profile operation succeeded. */
     SUCCESS,
+
+    /** Indicates that the operation failed due to an invalid profile name being provided. */
     INVALID_PROFILE_NAME,
+
+    /**
+     * Indicates that the operation failed due to a provided profile name not being unique among all
+     * other existing profiles.
+     */
     PROFILE_NAME_NOT_UNIQUE,
+
+    /**
+     * Indicates that the operation failed due to an internal failure when trying to store the
+     * profile's avatar image.
+     */
     FAILED_TO_STORE_IMAGE,
-    FAILED_TO_GENERATE_GRAVATAR,
+
+    /**
+     * Indicates that the operation failed due to an internal failure when trying to delete a
+     * profile's data directory.
+     */
     FAILED_TO_DELETE_DIR,
+
+    /** Indicates that the operation failed due to no profile existing for the provided ID. */
     PROFILE_NOT_FOUND,
+
+    /**
+     * Indicates that the operation failed due to the current user not being an app administrator
+     * despite the operation requiring administrator privileges.
+     */
     PROFILE_NOT_ADMIN,
+
+    /**
+     * Indicates that the operation failed due to an attempt to re-elevate an administrator to
+     * administrator status (this should never happen in regular app operations).
+     */
     PROFILE_ALREADY_HAS_ADMIN
   }
 
@@ -208,7 +234,8 @@ class ProfileManagementController @Inject constructor(
     avatarImagePath: Uri?,
     allowDownloadAccess: Boolean,
     colorRgb: Int,
-    isAdmin: Boolean
+    isAdmin: Boolean,
+    allowInLessonQuickLanguageSwitching: Boolean = false
   ): DataProvider<Any?> {
     val deferred = profileDataStore.storeDataWithCustomChannelAsync(
       updateInMemoryCache = true
@@ -233,6 +260,7 @@ class ProfileManagementController @Inject constructor(
         this.name = name
         this.pin = pin
         this.allowDownloadAccess = allowDownloadAccess
+        this.allowInLessonQuickLanguageSwitching = allowInLessonQuickLanguageSwitching
         this.id = ProfileId.newBuilder().setInternalId(nextProfileId).build()
         dateCreatedTimestampMs = oppiaClock.getCurrentTimeMs()
         this.isAdmin = isAdmin
@@ -489,6 +517,41 @@ class ProfileManagementController @Inject constructor(
     }
   }
 
+  /**
+   * Updates whether the user of the profile is allowed to use a user study-only in-lesson quick
+   * content language switcher.
+   *
+   * @param profileId the ID corresponding to the profile being updated
+   * @param allowInLessonQuickLanguageSwitching the new allowance status for the updating profile
+   * @return a [DataProvider] that indicates the success/failure of this update operation
+   */
+  fun updateEnableInLessonQuickLanguageSwitching(
+    profileId: ProfileId,
+    allowInLessonQuickLanguageSwitching: Boolean
+  ): DataProvider<Any?> {
+    val deferred = profileDataStore.storeDataWithCustomChannelAsync(
+      updateInMemoryCache = true
+    ) {
+      val profile =
+        it.profilesMap[profileId.internalId] ?: return@storeDataWithCustomChannelAsync Pair(
+          it,
+          ProfileActionStatus.PROFILE_NOT_FOUND
+        )
+      val updatedProfileDatabase = it.toBuilder().putProfiles(
+        profileId.internalId,
+        profile.toBuilder().apply {
+          this.allowInLessonQuickLanguageSwitching = allowInLessonQuickLanguageSwitching
+        }.build()
+      ).build()
+      Pair(updatedProfileDatabase, ProfileActionStatus.SUCCESS)
+    }
+    return dataProviders.createInMemoryDataProviderAsync(
+      UPDATE_ALL_DOWNLOAD_ACCESS_PROVIDER_ID
+    ) {
+      return@createInMemoryDataProviderAsync getDeferredResult(profileId, null, deferred)
+    }
+  }
+
   /**
    * Updates the story text size of the profile.
    *
@@ -617,8 +680,8 @@ class ProfileManagementController @Inject constructor(
   }
 
   /**
-   * Log in to the user's Profile by setting the current profile Id, updating profile's last logged in
-   * time and updating the total number of logins for the current profile Id.
+   * Log in to the user's Profile by setting the current profile Id, updating profile's last logged
+   * in time and updating the total number of logins for the current profile Id.
    *
    * @param profileId the ID corresponding to the profile being logged into.
    * @return a [DataProvider] that indicates the success/failure of this login operation.
@@ -630,6 +693,11 @@ class ProfileManagementController @Inject constructor(
         null,
         updateLastLoggedInAsyncAndNumberOfLogins(profileId)
       )
+    }.transform(UPDATE_SESSION_ID_PROVIDER_ID) {
+      // Since a new user has logged in (or the same user logged in again), a new session ID should
+      // be generated.
+      loggingIdentifierController.updateSessionId()
+      it
     }
   }
 
@@ -682,7 +750,7 @@ class ProfileManagementController @Inject constructor(
       }
       val installationId = loggingIdentifierController.fetchInstallationId()
       val learnerId = it.profilesMap.getValue(profileId.internalId).learnerId
-      learnerAnalyticsLogger.logDeleteProfile(installationId, learnerId)
+      learnerAnalyticsLogger.logDeleteProfile(installationId, profileId = null, learnerId)
       Pair(it.toBuilder().removeProfiles(profileId.internalId).build(), ProfileActionStatus.SUCCESS)
     }
     return dataProviders.createInMemoryDataProviderAsync(DELETE_PROFILE_PROVIDER_ID) {
@@ -705,7 +773,7 @@ class ProfileManagementController @Inject constructor(
       val installationId = loggingIdentifierController.fetchInstallationId()
       it.profilesMap.forEach { (internalProfileId, profile) ->
         directoryManagementUtil.deleteDir(internalProfileId.toString())
-        learnerAnalyticsLogger.logDeleteProfile(installationId, profile.learnerId)
+        learnerAnalyticsLogger.logDeleteProfile(installationId, profileId = null, profile.learnerId)
       }
       Pair(ProfileDatabase.getDefaultInstance(), ProfileActionStatus.SUCCESS)
     }
@@ -714,12 +782,11 @@ class ProfileManagementController @Inject constructor(
     }
   }
 
-  /**
-   * Returns the ProfileId of the current profile. The default value is -1 if currentProfileId
-   * hasn't been set.
-   */
-  fun getCurrentProfileId(): ProfileId {
-    return ProfileId.newBuilder().setInternalId(currentProfileId).build()
+  /** Returns the [ProfileId] of the current profile, or null if one hasn't yet been logged into. */
+  fun getCurrentProfileId(): ProfileId? {
+    return currentProfileId.takeIf { it != DEFAULT_LOGGED_OUT_INTERNAL_PROFILE_ID }?.let {
+      ProfileId.newBuilder().setInternalId(it).build()
+    }
   }
 
   /**
@@ -728,7 +795,7 @@ class ProfileManagementController @Inject constructor(
    *
    * See [fetchLearnerId] for specifics.
    */
-  suspend fun fetchCurrentLearnerId(): String? = fetchLearnerId(getCurrentProfileId())
+  suspend fun fetchCurrentLearnerId(): String? = getCurrentProfileId()?.let { fetchLearnerId(it) }
 
   /**
    * Returns the learner ID corresponding to the specified [profileId], or null if the specified
@@ -794,10 +861,6 @@ class ProfileManagementController @Inject constructor(
             "Failed to store user's selected avatar image"
           )
         )
-      ProfileActionStatus.FAILED_TO_GENERATE_GRAVATAR ->
-        AsyncResult.Failure(
-          FailedToGenerateGravatarException("Failed to generate a gravatar url")
-        )
       ProfileActionStatus.FAILED_TO_DELETE_DIR ->
         AsyncResult.Failure(
           FailedToDeleteDirException(
diff --git a/domain/src/main/java/org/oppia/android/domain/translation/TranslationController.kt b/domain/src/main/java/org/oppia/android/domain/translation/TranslationController.kt
index 7d0826ebccd..b8d3667a827 100644
--- a/domain/src/main/java/org/oppia/android/domain/translation/TranslationController.kt
+++ b/domain/src/main/java/org/oppia/android/domain/translation/TranslationController.kt
@@ -20,6 +20,8 @@ import org.oppia.android.util.data.AsyncDataSubscriptionManager
 import org.oppia.android.util.data.AsyncResult
 import org.oppia.android.util.data.DataProvider
 import org.oppia.android.util.data.DataProviders
+import org.oppia.android.util.data.DataProviders.Companion.combineWith
+import org.oppia.android.util.data.DataProviders.Companion.combineWithAsync
 import org.oppia.android.util.data.DataProviders.Companion.transform
 import org.oppia.android.util.data.DataProviders.Companion.transformAsync
 import org.oppia.android.util.locale.OppiaLocale
@@ -31,15 +33,24 @@ import kotlin.concurrent.withLock
 private const val SYSTEM_LANGUAGE_LOCALE_DATA_PROVIDER_ID = "system_language_locale"
 private const val APP_LANGUAGE_DATA_PROVIDER_ID = "app_language"
 private const val APP_LANGUAGE_LOCALE_DATA_PROVIDER_ID = "app_language_locale"
+private const val APP_LANGUAGE_SELECTION_DATA_PROVIDER_ID = "app_language_selection"
 private const val UPDATE_APP_LANGUAGE_DATA_PROVIDER_ID = "update_app_language"
 private const val WRITTEN_TRANSLATION_CONTENT_DATA_PROVIDER_ID = "written_translation_content"
 private const val WRITTEN_TRANSLATION_CONTENT_LOCALE_DATA_PROVIDER_ID =
   "written_translation_content_locale"
+private const val WRITTEN_TRANSLATION_CONTENT_LANG_RES_DATA_PROVIDER_ID =
+  "written_translation_content_language_resolution"
+private const val WRITTEN_TRANSLATION_CONTENT_SELECTION_DATA_PROVIDER_ID =
+  "written_translation_content_selection"
 private const val UPDATE_WRITTEN_TRANSLATION_CONTENT_DATA_PROVIDER_ID =
   "update_written_translation_content"
 private const val AUDIO_TRANSLATION_CONTENT_DATA_PROVIDER_ID = "audio_translation_content"
 private const val AUDIO_TRANSLATION_CONTENT_LOCALE_DATA_PROVIDER_ID =
   "audio_translation_content_locale"
+private const val AUDIO_TRANSLATION_CONTENT_LANG_RES_DATA_PROVIDER_ID =
+  "audio_translation_content_language_resolution"
+private const val AUDIO_TRANSLATION_CONTENT_SELECTION_DATA_PROVIDER_ID =
+  "audio_translation_content_selection"
 private const val UPDATE_AUDIO_TRANSLATION_CONTENT_DATA_PROVIDER_ID =
   "update_audio_translation_content"
 
@@ -101,9 +112,26 @@ class TranslationController @Inject constructor(
    */
   fun getAppLanguageLocale(profileId: ProfileId): DataProvider<OppiaLocale.DisplayLocale> {
     val providerId = APP_LANGUAGE_LOCALE_DATA_PROVIDER_ID
-    return getSystemLanguage().transformAsync(providerId) { systemLanguage ->
-      val language = computeAppLanguage(profileId, systemLanguage)
-      return@transformAsync localeController.retrieveAppStringDisplayLocale(language).retrieveData()
+    return getSystemLanguage().combineWithAsync(
+      getAppLanguageSelection(profileId), providerId
+    ) { systemLanguage, appLanguageSelection ->
+      localeController.retrieveAppStringDisplayLocale(
+        language = computeAppLanguage(appLanguageSelection).resolveToLanguage(systemLanguage)
+      ).retrieveData()
+    }
+  }
+
+  /**
+   * Returns a data provider for the [AppLanguageSelection] corresponding to the user's selected
+   * language for app strings (see [getAppLanguage]).
+   *
+   * Note that providing the returned selection to [updateAppLanguage] should result in no change to
+   * the underlying configured selection.
+   */
+  fun getAppLanguageSelection(profileId: ProfileId): DataProvider<AppLanguageSelection> {
+    val providerId = APP_LANGUAGE_SELECTION_DATA_PROVIDER_ID
+    return dataProviders.createInMemoryDataProvider(providerId) {
+      retrieveAppLanguageSelection(profileId)
     }
   }
 
@@ -117,12 +145,15 @@ class TranslationController @Inject constructor(
    * language matches a supported language, otherwise the app defaults to English).
    *
    * @return a [DataProvider] which succeeds only if the update succeeds, otherwise fails (only one
-   *     result is ever provided)
+   *     result is ever provided). The payload of the data provider is the *previous* selection
+   *     state.
    */
-  fun updateAppLanguage(profileId: ProfileId, selection: AppLanguageSelection): DataProvider<Any> {
+  fun updateAppLanguage(
+    profileId: ProfileId,
+    selection: AppLanguageSelection
+  ): DataProvider<AppLanguageSelection> {
     return dataProviders.createInMemoryDataProviderAsync(UPDATE_APP_LANGUAGE_DATA_PROVIDER_ID) {
-      updateAppLanguageSelection(profileId, selection)
-      return@createInMemoryDataProviderAsync AsyncResult.Success(Unit)
+      AsyncResult.Success(updateAppLanguageSelection(profileId, selection))
     }
   }
 
@@ -146,11 +177,35 @@ class TranslationController @Inject constructor(
   fun getWrittenTranslationContentLocale(
     profileId: ProfileId
   ): DataProvider<OppiaLocale.ContentLocale> {
-    val providerId = WRITTEN_TRANSLATION_CONTENT_LOCALE_DATA_PROVIDER_ID
-    return getSystemLanguage().transformAsync(providerId) { systemLanguage ->
-      val language = computeWrittenTranslationContentLanguage(profileId, systemLanguage)
+    val resolvedLanguageProvider =
+      getWrittenTranslationContentLanguageSelection(profileId).combineWith(
+        getAppLanguageSelection(profileId), WRITTEN_TRANSLATION_CONTENT_LANG_RES_DATA_PROVIDER_ID
+      ) { contentLanguageSelection, appLanguageSelection ->
+        computeWrittenTranslationContentLanguage(appLanguageSelection, contentLanguageSelection)
+      }
+    return getSystemLanguage().combineWithAsync(
+      resolvedLanguageProvider, WRITTEN_TRANSLATION_CONTENT_LOCALE_DATA_PROVIDER_ID
+    ) { systemLanguage, resolutionStatus ->
+      val language = resolutionStatus.resolveToLanguage(systemLanguage)
       val writtenTranslationLocale = localeController.retrieveWrittenTranslationsLocale(language)
-      return@transformAsync writtenTranslationLocale.retrieveData()
+      return@combineWithAsync writtenTranslationLocale.retrieveData()
+    }
+  }
+
+  /**
+   * Returns a data provider for the [WrittenTranslationLanguageSelection] corresponding to the
+   * user's selected language for written content strings (see
+   * [getWrittenTranslationContentLanguage]).
+   *
+   * Note that providing the returned selection to [updateWrittenTranslationContentLanguage] should
+   * result in no change to the underlying configured selection.
+   */
+  fun getWrittenTranslationContentLanguageSelection(
+    profileId: ProfileId
+  ): DataProvider<WrittenTranslationLanguageSelection> {
+    val providerId = WRITTEN_TRANSLATION_CONTENT_SELECTION_DATA_PROVIDER_ID
+    return dataProviders.createInMemoryDataProvider(providerId) {
+      retrieveWrittenTranslationContentLanguageSelection(profileId)
     }
   }
 
@@ -164,16 +219,16 @@ class TranslationController @Inject constructor(
    * superset. The actual availability for a particular language is topic-dependent.
    *
    * @return a [DataProvider] which succeeds only if the update succeeds, otherwise fails (only one
-   *     result is ever provided)
+   *     result is ever provided). The payload of the data provider is the *previous* selection
+   *     state.
    */
   fun updateWrittenTranslationContentLanguage(
     profileId: ProfileId,
     selection: WrittenTranslationLanguageSelection
-  ): DataProvider<Any> {
+  ): DataProvider<WrittenTranslationLanguageSelection> {
     val providerId = UPDATE_WRITTEN_TRANSLATION_CONTENT_DATA_PROVIDER_ID
     return dataProviders.createInMemoryDataProviderAsync(providerId) {
-      updateWrittenTranslationContentLanguageSelection(profileId, selection)
-      return@createInMemoryDataProviderAsync AsyncResult.Success(Unit)
+      AsyncResult.Success(updateWrittenTranslationContentLanguageSelection(profileId, selection))
     }
   }
 
@@ -197,11 +252,34 @@ class TranslationController @Inject constructor(
   fun getAudioTranslationContentLocale(
     profileId: ProfileId
   ): DataProvider<OppiaLocale.ContentLocale> {
-    val providerId = AUDIO_TRANSLATION_CONTENT_LOCALE_DATA_PROVIDER_ID
-    return getSystemLanguage().transformAsync(providerId) { systemLanguage ->
-      val language = computeAudioTranslationContentLanguage(profileId, systemLanguage)
+    val resolvedLanguageProvider =
+      getAudioTranslationContentLanguageSelection(profileId).combineWith(
+        getAppLanguageSelection(profileId), AUDIO_TRANSLATION_CONTENT_LANG_RES_DATA_PROVIDER_ID
+      ) { audioLanguageSelection, appLanguageSelection ->
+        computeAudioTranslationContentLanguage(appLanguageSelection, audioLanguageSelection)
+      }
+    return getSystemLanguage().combineWithAsync(
+      resolvedLanguageProvider, AUDIO_TRANSLATION_CONTENT_LOCALE_DATA_PROVIDER_ID
+    ) { systemLanguage, resolutionStatus ->
+      val language = resolutionStatus.resolveToLanguage(systemLanguage)
       val audioTranslationLocale = localeController.retrieveAudioTranslationsLocale(language)
-      return@transformAsync audioTranslationLocale.retrieveData()
+      return@combineWithAsync audioTranslationLocale.retrieveData()
+    }
+  }
+
+  /**
+   * Returns a data provider for the [AudioTranslationLanguageSelection] corresponding to the user's
+   * selected language for audio voiceovers (see [getAudioTranslationContentLanguage]).
+   *
+   * Note that providing the returned selection to [updateAudioTranslationContentLanguage] should
+   * result in no change to the underlying configured selection.
+   */
+  fun getAudioTranslationContentLanguageSelection(
+    profileId: ProfileId
+  ): DataProvider<AudioTranslationLanguageSelection> {
+    val providerId = AUDIO_TRANSLATION_CONTENT_SELECTION_DATA_PROVIDER_ID
+    return dataProviders.createInMemoryDataProvider(providerId) {
+      retrieveAudioTranslationContentLanguageSelection(profileId)
     }
   }
 
@@ -215,16 +293,16 @@ class TranslationController @Inject constructor(
    * The actual availability for a particular language is topic-dependent.
    *
    * @return a [DataProvider] which succeeds only if the update succeeds, otherwise fails (only one
-   *     result is ever provided)
+   *     result is ever provided). The payload of the data provider is the *previous* selection
+   *     state.
    */
   fun updateAudioTranslationContentLanguage(
     profileId: ProfileId,
     selection: AudioTranslationLanguageSelection
-  ): DataProvider<Any> {
+  ): DataProvider<AudioTranslationLanguageSelection> {
     val providerId = UPDATE_AUDIO_TRANSLATION_CONTENT_DATA_PROVIDER_ID
     return dataProviders.createInMemoryDataProviderAsync(providerId) {
-      updateAudioTranslationContentLanguageSelection(profileId, selection)
-      return@createInMemoryDataProviderAsync AsyncResult.Success(Unit)
+      AsyncResult.Success(updateAudioTranslationContentLanguageSelection(profileId, selection))
     }
   }
 
@@ -285,59 +363,57 @@ class TranslationController @Inject constructor(
   }.build()
 
   private fun computeAppLanguage(
-    profileId: ProfileId,
-    systemLanguage: OppiaLanguage
-  ): OppiaLanguage {
-    val languageSelection = retrieveAppLanguageSelection(profileId)
+    languageSelection: AppLanguageSelection
+  ): LanguageResolutionStatus {
     return when (languageSelection.selectionTypeCase) {
-      AppLanguageSelection.SelectionTypeCase.SELECTED_LANGUAGE -> languageSelection.selectedLanguage
+      AppLanguageSelection.SelectionTypeCase.SELECTED_LANGUAGE ->
+        LanguageResolutionStatus.Resolved(languageSelection.selectedLanguage)
       AppLanguageSelection.SelectionTypeCase.USE_SYSTEM_LANGUAGE_OR_APP_DEFAULT,
-      AppLanguageSelection.SelectionTypeCase.SELECTIONTYPE_NOT_SET, null -> systemLanguage
+      AppLanguageSelection.SelectionTypeCase.SELECTIONTYPE_NOT_SET, null ->
+        LanguageResolutionStatus.UseSystemLanguage
     }
   }
 
   private fun computeWrittenTranslationContentLanguage(
-    profileId: ProfileId,
-    systemLanguage: OppiaLanguage
-  ): OppiaLanguage {
-    val languageSelection = retrieveWrittenTranslationContentLanguageSelection(profileId)
-    return when (languageSelection.selectionTypeCase) {
+    appLanguageSelection: AppLanguageSelection,
+    contentLanguageSelection: WrittenTranslationLanguageSelection
+  ): LanguageResolutionStatus {
+    return when (contentLanguageSelection.selectionTypeCase) {
       WrittenTranslationLanguageSelection.SelectionTypeCase.SELECTED_LANGUAGE ->
-        languageSelection.selectedLanguage
+        LanguageResolutionStatus.Resolved(contentLanguageSelection.selectedLanguage)
       WrittenTranslationLanguageSelection.SelectionTypeCase.USE_APP_LANGUAGE,
       WrittenTranslationLanguageSelection.SelectionTypeCase.SELECTIONTYPE_NOT_SET, null ->
-        computeAppLanguage(profileId, systemLanguage)
+        computeAppLanguage(appLanguageSelection)
     }
   }
 
   private fun computeAudioTranslationContentLanguage(
-    profileId: ProfileId,
-    systemLanguage: OppiaLanguage
-  ): OppiaLanguage {
-    val languageSelection = retrieveAudioTranslationContentLanguageSelection(profileId)
-    return when (languageSelection.selectionTypeCase) {
+    appLanguageSelection: AppLanguageSelection,
+    audioLanguageSelection: AudioTranslationLanguageSelection
+  ): LanguageResolutionStatus {
+    return when (audioLanguageSelection.selectionTypeCase) {
       AudioTranslationLanguageSelection.SelectionTypeCase.SELECTED_LANGUAGE ->
-        languageSelection.selectedLanguage
+        LanguageResolutionStatus.Resolved(audioLanguageSelection.selectedLanguage)
       AudioTranslationLanguageSelection.SelectionTypeCase.USE_APP_LANGUAGE,
       AudioTranslationLanguageSelection.SelectionTypeCase.SELECTIONTYPE_NOT_SET, null ->
-        computeAppLanguage(profileId, systemLanguage)
+        computeAppLanguage(appLanguageSelection)
     }
   }
 
-  private fun retrieveAppLanguageSelection(profileId: ProfileId): AppLanguageSelection {
-    return dataLock.withLock {
+  private fun retrieveAppLanguageSelection(profileId: ProfileId) =
+    dataLock.withLock {
       appLanguageSettings[profileId] ?: AppLanguageSelection.getDefaultInstance()
     }
-  }
 
   private suspend fun updateAppLanguageSelection(
     profileId: ProfileId,
     selection: AppLanguageSelection
-  ) {
-    dataLock.withLock {
-      appLanguageSettings[profileId] = selection
-    }
-    asyncDataSubscriptionManager.notifyChange(APP_LANGUAGE_LOCALE_DATA_PROVIDER_ID)
+  ): AppLanguageSelection {
+    return dataLock.withLock {
+      appLanguageSettings.put(profileId, selection)
+    }.also {
+      asyncDataSubscriptionManager.notifyChange(APP_LANGUAGE_LOCALE_DATA_PROVIDER_ID)
+    } ?: AppLanguageSelection.getDefaultInstance()
   }
 
   private fun retrieveWrittenTranslationContentLanguageSelection(
@@ -352,11 +428,12 @@ class TranslationController @Inject constructor(
   private suspend fun updateWrittenTranslationContentLanguageSelection(
     profileId: ProfileId,
     selection: WrittenTranslationLanguageSelection
-  ) {
-    dataLock.withLock {
-      writtenTranslationLanguageSettings[profileId] = selection
-    }
-    asyncDataSubscriptionManager.notifyChange(WRITTEN_TRANSLATION_CONTENT_LOCALE_DATA_PROVIDER_ID)
+  ): WrittenTranslationLanguageSelection {
+    return dataLock.withLock {
+      writtenTranslationLanguageSettings.put(profileId, selection)
+    }.also {
+      asyncDataSubscriptionManager.notifyChange(WRITTEN_TRANSLATION_CONTENT_LOCALE_DATA_PROVIDER_ID)
+    } ?: WrittenTranslationLanguageSelection.getDefaultInstance()
   }
 
   private fun retrieveAudioTranslationContentLanguageSelection(
@@ -371,11 +448,12 @@ class TranslationController @Inject constructor(
   private suspend fun updateAudioTranslationContentLanguageSelection(
     profileId: ProfileId,
     selection: AudioTranslationLanguageSelection
-  ) {
-    dataLock.withLock {
-      audioVoiceoverLanguageSettings[profileId] = selection
-    }
-    asyncDataSubscriptionManager.notifyChange(AUDIO_TRANSLATION_CONTENT_LOCALE_DATA_PROVIDER_ID)
+  ): AudioTranslationLanguageSelection {
+    return dataLock.withLock {
+      audioVoiceoverLanguageSettings.put(profileId, selection)
+    }.also {
+      asyncDataSubscriptionManager.notifyChange(AUDIO_TRANSLATION_CONTENT_LOCALE_DATA_PROVIDER_ID)
+    } ?: AudioTranslationLanguageSelection.getDefaultInstance()
   }
 
   private fun getSystemLanguage(): DataProvider<OppiaLanguage> =
@@ -401,6 +479,22 @@ class TranslationController @Inject constructor(
     }
   }
 
+  /**
+   * A helper class to provide complete language resolution for cases where there may be multiple
+   * levels of indirection (such as written language translations falling back to the app language
+   * and the app language falling back to the system language).
+   */
+  private sealed class LanguageResolutionStatus {
+    /** Indicates a fully resolved [OppiaLanguage] that may be used for localization. */
+    data class Resolved(val language: OppiaLanguage) : LanguageResolutionStatus()
+
+    /**
+     * Indicates that no explicit [OppiaLanguage] can be resolved and that, instead, the system
+     * language must be used.
+     */
+    object UseSystemLanguage : LanguageResolutionStatus()
+  }
+
   private companion object {
     private fun Translation.extractHtml(): String? = takeIf {
       it.dataFormatCase == Translation.DataFormatCase.HTML
@@ -414,5 +508,14 @@ class TranslationController @Inject constructor(
       // The force-non-null operator is safe here since nulls are filtered out.
       return mapValues(map).filterValues { it != null }.mapValues { (_, value) -> value!! }
     }
+
+    private fun LanguageResolutionStatus.resolveToLanguage(
+      systemLanguage: OppiaLanguage
+    ): OppiaLanguage {
+      return when (this) {
+        is LanguageResolutionStatus.Resolved -> language
+        LanguageResolutionStatus.UseSystemLanguage -> systemLanguage
+      }
+    }
   }
 }
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 02133abdb74..655ba70bd3a 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
@@ -488,6 +488,7 @@ class AudioPlayerControllerTest {
     arrangeMediaPlayer(contentId = "test_content_id")
 
     audioPlayerController.play(isPlayingFromAutoPlay = true, reloadingMainContent = true)
+    testCoroutineDispatchers.runCurrent()
 
     // No audio event is logged when an auto-play corresponds to a new content card (since it's
     // continuing a play from an earlier state that was already logged).
@@ -503,6 +504,7 @@ class AudioPlayerControllerTest {
     beginExploration(topicId = "test_topic_id", storyId = "test_story_id", explorationId)
 
     audioPlayerController.play(isPlayingFromAutoPlay = true, reloadingMainContent = false)
+    testCoroutineDispatchers.runCurrent()
 
     // This is the default case: when the user opens the audio bar it will auto-play audio (but not
     // 'reload' the main content since it's an initial load).
@@ -535,6 +537,7 @@ class AudioPlayerControllerTest {
     beginExploration(topicId = "test_topic_id", storyId = "test_story_id", explorationId)
 
     audioPlayerController.play(isPlayingFromAutoPlay = false, reloadingMainContent = true)
+    testCoroutineDispatchers.runCurrent()
 
     // This case is only hypothetically possible, but shouldn't happen in practice (since main
     // content is always auto-played when reloaded).
@@ -567,6 +570,7 @@ class AudioPlayerControllerTest {
     beginExploration(topicId = "test_topic_id", storyId = "test_story_id", explorationId)
 
     audioPlayerController.play(isPlayingFromAutoPlay = false, reloadingMainContent = false)
+    testCoroutineDispatchers.runCurrent()
 
     // This case corresponds to the user manually playing audio (e.g. after pausing).
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
@@ -599,6 +603,7 @@ class AudioPlayerControllerTest {
     beginExploration(topicId = "test_topic_id", storyId = "test_story_id", explorationId)
 
     audioPlayerController.play(isPlayingFromAutoPlay = false, reloadingMainContent = false)
+    testCoroutineDispatchers.runCurrent()
 
     // If there's no content ID then it'll be missing from the log.
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
@@ -612,6 +617,7 @@ class AudioPlayerControllerTest {
     logIntoAnalyticsReadyAdminProfile()
 
     audioPlayerController.play(isPlayingFromAutoPlay = false, reloadingMainContent = false)
+    testCoroutineDispatchers.runCurrent()
 
     // No event should be logged if outside an exploration when playing/pausing audio (such as for
     // questions).
@@ -626,8 +632,10 @@ class AudioPlayerControllerTest {
     logIntoAnalyticsReadyAdminProfile()
     beginExploration(topicId = "test_topic_id", storyId = "test_story_id", explorationId)
     audioPlayerController.play(isPlayingFromAutoPlay = false, reloadingMainContent = false)
+    testCoroutineDispatchers.runCurrent()
 
     audioPlayerController.pause(isFromExplicitUserAction = true)
+    testCoroutineDispatchers.runCurrent()
 
     // This case corresponds to the user manually pausing audio.
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
@@ -659,8 +667,10 @@ class AudioPlayerControllerTest {
     logIntoAnalyticsReadyAdminProfile()
     beginExploration(topicId = "test_topic_id", storyId = "test_story_id", explorationId)
     audioPlayerController.play(isPlayingFromAutoPlay = false, reloadingMainContent = false)
+    testCoroutineDispatchers.runCurrent()
 
     audioPlayerController.pause(isFromExplicitUserAction = true)
+    testCoroutineDispatchers.runCurrent()
 
     // If there's no content ID then it'll be missing from the log.
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
@@ -673,9 +683,11 @@ class AudioPlayerControllerTest {
     arrangeMediaPlayer(contentId = "test_content_id")
     logIntoAnalyticsReadyAdminProfile()
     audioPlayerController.play(isPlayingFromAutoPlay = false, reloadingMainContent = false)
+    testCoroutineDispatchers.runCurrent()
     fakeAnalyticsEventLogger.clearAllEvents() // Remove unrelated events.
 
     audioPlayerController.pause(isFromExplicitUserAction = true)
+    testCoroutineDispatchers.runCurrent()
 
     // No event should be logged if outside an exploration when playing/pausing audio (such as for
     // questions).
@@ -690,9 +702,11 @@ class AudioPlayerControllerTest {
     logIntoAnalyticsReadyAdminProfile()
     beginExploration(topicId = "test_topic_id", storyId = "test_story_id", explorationId)
     audioPlayerController.play(isPlayingFromAutoPlay = false, reloadingMainContent = false)
+    testCoroutineDispatchers.runCurrent()
     fakeAnalyticsEventLogger.clearAllEvents() // Remove unrelated events.
 
     audioPlayerController.pause(isFromExplicitUserAction = false)
+    testCoroutineDispatchers.runCurrent()
 
     // Automatic pausing (such as navigating away from a lesson) should not logged an event.
     // This case corresponds to the user manually pausing audio.
@@ -706,9 +720,11 @@ class AudioPlayerControllerTest {
     arrangeMediaPlayer(contentId = "test_content_id", languageCode = "sw")
     logIntoAnalyticsReadyAdminProfile()
     beginExploration(topicId = "test_topic_id", storyId = "test_story_id", explorationId)
+    testCoroutineDispatchers.runCurrent()
     fakeAnalyticsEventLogger.clearAllEvents() // Remove unrelated events.
 
     audioPlayerController.pause(isFromExplicitUserAction = true)
+    testCoroutineDispatchers.runCurrent()
 
     // Pausing when not actually playing should never log an event since it's an invalid state.
     assertThat(fakeAnalyticsEventLogger.noEventsPresent()).isTrue()
@@ -721,9 +737,11 @@ class AudioPlayerControllerTest {
     arrangeMediaPlayer(contentId = "test_content_id", languageCode = "sw")
     logIntoAnalyticsReadyAdminProfile()
     beginExploration(topicId = "test_topic_id", storyId = "test_story_id", explorationId)
+    testCoroutineDispatchers.runCurrent()
     fakeAnalyticsEventLogger.clearAllEvents() // Remove unrelated events.
 
     audioPlayerController.pause(isFromExplicitUserAction = false)
+    testCoroutineDispatchers.runCurrent()
 
     // Pausing when not actually playing should never log an event since it's an invalid state.
     assertThat(fakeAnalyticsEventLogger.noEventsPresent()).isTrue()
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 b8369a6bcf2..24883f17806 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
@@ -2326,7 +2326,7 @@ class ExplorationProgressControllerTest {
     submitWrongAnswerForPrototypeState2()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
-    assertThat(eventLog).hasHintOfferedContextThat {
+    assertThat(eventLog).hasHintUnlockedContextThat {
       hasExplorationDetailsThat().containsTestExp2Details()
       hasExplorationDetailsThat().hasStateNameThat().isEqualTo("Fractions")
       hasHintIndexThat().isEqualTo(0)
@@ -2369,7 +2369,7 @@ class ExplorationProgressControllerTest {
     submitMultipleChoiceAnswer(choiceIndex = 0)
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
-    assertThat(eventLog).hasHintOfferedContextThat {
+    assertThat(eventLog).hasHintUnlockedContextThat {
       hasExplorationDetailsThat().containsFractionsExp0Details()
       hasExplorationDetailsThat().hasStateNameThat().isEqualTo("Parts of a whole")
       hasHintIndexThat().isEqualTo(0)
@@ -2419,8 +2419,8 @@ class ExplorationProgressControllerTest {
     testCoroutineDispatchers.advanceTimeBy(TimeUnit.SECONDS.toMillis(10))
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
-    assertThat(eventLog).hasSolutionOfferedContextThat().containsTestExp2Details()
-    assertThat(eventLog).hasSolutionOfferedContextThat().hasStateNameThat().isEqualTo("Fractions")
+    assertThat(eventLog).hasSolutionUnlockedContextThat().containsTestExp2Details()
+    assertThat(eventLog).hasSolutionUnlockedContextThat().hasStateNameThat().isEqualTo("Fractions")
   }
 
   @Test
@@ -2475,6 +2475,122 @@ class ExplorationProgressControllerTest {
     assertThat(eventLog).hasFinishExplorationContextThat().hasStateNameThat().isEqualTo("End")
   }
 
+  @Test
+  fun testUpdateLanguageMidLesson_englishToSwahili_updatesProfilesContentLanguage() {
+    logIntoAnalyticsReadyAdminProfile()
+    updateContentLanguage(profileId, OppiaLanguage.ENGLISH)
+    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    waitForGetCurrentStateSuccessfulLoad()
+
+    val updateProv = explorationProgressController.updateWrittenTranslationContentLanguageMidLesson(
+      profileId,
+      WrittenTranslationLanguageSelection.newBuilder().apply {
+        selectedLanguage = OppiaLanguage.SWAHILI
+      }.build()
+    )
+    monitorFactory.waitForNextSuccessfulResult(updateProv)
+
+    // Verify that the learner's profile-wide content language has changed.
+    val contentLangProvider = translationController.getWrittenTranslationContentLanguage(profileId)
+    val contentLanguage = monitorFactory.waitForNextSuccessfulResult(contentLangProvider)
+    assertThat(contentLanguage).isEqualTo(OppiaLanguage.SWAHILI)
+  }
+
+  @Test
+  fun testUpdateLanguageMidLesson_englishToSwahili_logsLanguageSwitchEvent() {
+    logIntoAnalyticsReadyAdminProfile()
+    updateContentLanguage(profileId, OppiaLanguage.ENGLISH)
+    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    waitForGetCurrentStateSuccessfulLoad()
+
+    val updateProv = explorationProgressController.updateWrittenTranslationContentLanguageMidLesson(
+      profileId,
+      WrittenTranslationLanguageSelection.newBuilder().apply {
+        selectedLanguage = OppiaLanguage.SWAHILI
+      }.build()
+    )
+    monitorFactory.waitForNextSuccessfulResult(updateProv)
+
+    // Verify that the language switch event was correctly logged.
+    val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
+    assertThat(eventLog).hasSwitchInLessonLanguageContextThat {
+      hasExplorationDetailsThat().containsTestExp2Details()
+      hasSwitchFromLanguageThat().isEqualTo(OppiaLanguage.ENGLISH)
+      hasSwitchToLanguageThat().isEqualTo(OppiaLanguage.SWAHILI)
+    }
+  }
+
+  @Test
+  fun testUpdateLanguageMidLesson_englishToSwahili_diffProfile_doesNotChangeOtherProfilesLang() {
+    val englishProfileId = ProfileId.newBuilder().apply { internalId = 1 }.build()
+    val arabicProfileId = ProfileId.newBuilder().apply { internalId = 2 }.build()
+    updateContentLanguage(englishProfileId, OppiaLanguage.ENGLISH)
+    updateContentLanguage(arabicProfileId, OppiaLanguage.ARABIC)
+    startPlayingNewExploration(
+      TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2, profileId = englishProfileId
+    )
+    waitForGetCurrentStateSuccessfulLoad()
+
+    val updateProv = explorationProgressController.updateWrittenTranslationContentLanguageMidLesson(
+      englishProfileId,
+      WrittenTranslationLanguageSelection.newBuilder().apply {
+        selectedLanguage = OppiaLanguage.SWAHILI
+      }.build()
+    )
+    monitorFactory.waitForNextSuccessfulResult(updateProv)
+
+    // Verify that the other learner's profile-wide content language hasn't changed.
+    val contentLangProvider =
+      translationController.getWrittenTranslationContentLanguage(arabicProfileId)
+    val contentLanguage = monitorFactory.waitForNextSuccessfulResult(contentLangProvider)
+    assertThat(contentLanguage).isEqualTo(OppiaLanguage.ARABIC)
+  }
+
+  @Test
+  fun testUpdateLanguageMidLesson_swahiliToEnglish_updatesProfilesContentLanguage() {
+    logIntoAnalyticsReadyAdminProfile()
+    updateContentLanguage(profileId, OppiaLanguage.SWAHILI)
+    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    waitForGetCurrentStateSuccessfulLoad()
+
+    val updateProv = explorationProgressController.updateWrittenTranslationContentLanguageMidLesson(
+      profileId,
+      WrittenTranslationLanguageSelection.newBuilder().apply {
+        selectedLanguage = OppiaLanguage.ENGLISH
+      }.build()
+    )
+    monitorFactory.waitForNextSuccessfulResult(updateProv)
+
+    // Verify that the learner's profile-wide content language has changed.
+    val contentLangProvider = translationController.getWrittenTranslationContentLanguage(profileId)
+    val contentLanguage = monitorFactory.waitForNextSuccessfulResult(contentLangProvider)
+    assertThat(contentLanguage).isEqualTo(OppiaLanguage.ENGLISH)
+  }
+
+  @Test
+  fun testUpdateLanguageMidLesson_swahiliToEnglish_logsLanguageSwitchEvent() {
+    logIntoAnalyticsReadyAdminProfile()
+    updateContentLanguage(profileId, OppiaLanguage.SWAHILI)
+    startPlayingNewExploration(TEST_TOPIC_ID_0, TEST_STORY_ID_0, TEST_EXPLORATION_ID_2)
+    waitForGetCurrentStateSuccessfulLoad()
+
+    val updateProv = explorationProgressController.updateWrittenTranslationContentLanguageMidLesson(
+      profileId,
+      WrittenTranslationLanguageSelection.newBuilder().apply {
+        selectedLanguage = OppiaLanguage.ENGLISH
+      }.build()
+    )
+    monitorFactory.waitForNextSuccessfulResult(updateProv)
+
+    // Verify that the language switch event was correctly logged.
+    val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
+    assertThat(eventLog).hasSwitchInLessonLanguageContextThat {
+      hasExplorationDetailsThat().containsTestExp2Details()
+      hasSwitchFromLanguageThat().isEqualTo(OppiaLanguage.SWAHILI)
+      hasSwitchToLanguageThat().isEqualTo(OppiaLanguage.ENGLISH)
+    }
+  }
+
   private fun setUpTestApplicationComponent() {
     ApplicationProvider.getApplicationContext<TestApplication>().inject(this)
   }
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 c793430fbb3..a3a35e10c42 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
@@ -13,6 +13,7 @@ import dagger.Provides
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.CLOSE_REVISION_CARD
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.OPEN_CONCEPT_CARD
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.OPEN_EXPLORATION_ACTIVITY
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.OPEN_HOME
@@ -98,9 +99,12 @@ class OppiaLoggerTest {
     private val TEST_ERROR_EXCEPTION = Throwable(TEST_ERROR_LOG_EXCEPTION)
   }
 
-  @Inject lateinit var oppiaLogger: OppiaLogger
-  @Inject lateinit var fakeAnalyticsEventLogger: FakeAnalyticsEventLogger
-  @Inject lateinit var fakeOppiaClock: FakeOppiaClock
+  @Inject
+  lateinit var oppiaLogger: OppiaLogger
+  @Inject
+  lateinit var fakeAnalyticsEventLogger: FakeAnalyticsEventLogger
+  @Inject
+  lateinit var fakeOppiaClock: FakeOppiaClock
 
   @Before
   fun setUp() {
@@ -108,19 +112,6 @@ class OppiaLoggerTest {
     ShadowLog.reset()
   }
 
-  @Test
-  fun testLogImportantEvent_forOpenHomeEvent_logsEssentialEventWithCurrentTime() {
-    fakeOppiaClock.setFakeTimeMode(FakeOppiaClock.FakeTimeMode.MODE_FIXED_FAKE_TIME)
-    fakeOppiaClock.setCurrentTimeMs(TEST_TIMESTAMP)
-    val openHomeEventContext = oppiaLogger.createOpenHomeContext()
-
-    oppiaLogger.logImportantEvent(openHomeEventContext)
-
-    val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
-    assertThat(eventLog).isEssentialPriority()
-    assertThat(eventLog).hasTimestampThat().isEqualTo(TEST_TIMESTAMP)
-  }
-
   @Test
   fun testConsoleLogger_logVerboseMessage_checkLoggedMessageIsCorrect() {
     oppiaLogger.v(TEST_VERBOSE_LOG_TAG, TEST_VERBOSE_LOG_MSG)
@@ -311,14 +302,22 @@ class OppiaLoggerTest {
 
   @Test
   fun testController_createOpenRevisionCardContext_returnsCorrectRevisionCardContext() {
-    val eventContext =
-      oppiaLogger.createOpenRevisionCardContext(TEST_TOPIC_ID, TEST_SUB_TOPIC_ID)
+    val eventContext = oppiaLogger.createOpenRevisionCardContext(TEST_TOPIC_ID, TEST_SUB_TOPIC_ID)
 
     assertThat(eventContext.activityContextCase).isEqualTo(OPEN_REVISION_CARD)
     assertThat(eventContext.openRevisionCard.topicId).matches(TEST_TOPIC_ID)
     assertThat(eventContext.openRevisionCard.subTopicId).isEqualTo(TEST_SUB_TOPIC_ID)
   }
 
+  @Test
+  fun testController_createCloseRevisionCardContext_returnsCorrectRevisionCardContext() {
+    val eventContext = oppiaLogger.createCloseRevisionCardContext(TEST_TOPIC_ID, TEST_SUB_TOPIC_ID)
+
+    assertThat(eventContext.activityContextCase).isEqualTo(CLOSE_REVISION_CARD)
+    assertThat(eventContext.closeRevisionCard.topicId).matches(TEST_TOPIC_ID)
+    assertThat(eventContext.closeRevisionCard.subTopicId).isEqualTo(TEST_SUB_TOPIC_ID)
+  }
+
   private fun setUpTestApplicationComponent() {
     DaggerOppiaLoggerTest_TestApplicationComponent.builder()
       .setApplication(ApplicationProvider.getApplicationContext())
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 4b645b42c17..2cf71bad6f3 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
@@ -12,11 +12,23 @@ import dagger.Provides
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.oppia.android.app.model.AppLanguageSelection
+import org.oppia.android.app.model.AudioTranslationLanguageSelection
+import org.oppia.android.app.model.OppiaLanguage
+import org.oppia.android.app.model.OppiaLanguage.ENGLISH
+import org.oppia.android.app.model.OppiaLanguage.HINGLISH
+import org.oppia.android.app.model.OppiaLanguage.SWAHILI
+import org.oppia.android.app.model.ProfileId
+import org.oppia.android.app.model.WrittenTranslationLanguageSelection
 import org.oppia.android.domain.oppialogger.EventLogStorageCacheSize
+import org.oppia.android.domain.oppialogger.ExceptionLogStorageCacheSize
 import org.oppia.android.domain.oppialogger.LoggingIdentifierModule
 import org.oppia.android.domain.oppialogger.OppiaLogger
+import org.oppia.android.domain.oppialogger.PerformanceMetricsLogStorageCacheSize
 import org.oppia.android.domain.platformparameter.PlatformParameterModule
 import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule
+import org.oppia.android.domain.profile.ProfileManagementController
+import org.oppia.android.domain.translation.TranslationController
 import org.oppia.android.testing.FakeAnalyticsEventLogger
 import org.oppia.android.testing.TestLogReportingModule
 import org.oppia.android.testing.data.DataProviderTestMonitor
@@ -24,8 +36,10 @@ import org.oppia.android.testing.logging.EventLogSubject.Companion.assertThat
 import org.oppia.android.testing.logging.FakeSyncStatusManager
 import org.oppia.android.testing.logging.SyncStatusTestModule
 import org.oppia.android.testing.robolectric.RobolectricModule
+import org.oppia.android.testing.threading.TestCoroutineDispatchers
 import org.oppia.android.testing.threading.TestDispatcherModule
 import org.oppia.android.testing.time.FakeOppiaClockModule
+import org.oppia.android.util.caching.AssetModule
 import org.oppia.android.util.data.DataProviders
 import org.oppia.android.util.data.DataProvidersInjector
 import org.oppia.android.util.data.DataProvidersInjectorProvider
@@ -56,7 +70,8 @@ private const val TEST_SUB_TOPIC_ID = 1
 
 /** Tests for [AnalyticsController]. */
 // FunctionName: test names are conventionally named with underscores.
-@Suppress("FunctionName")
+// SameParameterValue: tests should have specific context included/excluded for readability.
+@Suppress("FunctionName", "SameParameterValue")
 @RunWith(AndroidJUnit4::class)
 @LooperMode(LooperMode.Mode.PAUSED)
 @Config(application = AnalyticsControllerTest.TestApplication::class)
@@ -68,6 +83,9 @@ class AnalyticsControllerTest {
   @Inject lateinit var dataProviders: DataProviders
   @Inject lateinit var monitorFactory: DataProviderTestMonitor.Factory
   @Inject lateinit var fakeSyncStatusManager: FakeSyncStatusManager
+  @Inject lateinit var profileManagementController: ProfileManagementController
+  @Inject lateinit var translationController: TranslationController
+  @Inject lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
 
   @Before
   fun setUp() {
@@ -77,14 +95,16 @@ class AnalyticsControllerTest {
   @Test
   fun testController_logImportantEvent_withQuestionContext_checkLogsEvent() {
     analyticsController.logImportantEvent(
-      TEST_TIMESTAMP,
       oppiaLogger.createOpenQuestionPlayerContext(
         TEST_QUESTION_ID,
         listOf(
           TEST_SKILL_LIST_ID, TEST_SKILL_LIST_ID
         )
-      )
+      ),
+      profileId = null,
+      TEST_TIMESTAMP
     )
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasTimestampThat().isEqualTo(TEST_TIMESTAMP)
@@ -95,13 +115,15 @@ class AnalyticsControllerTest {
   @Test
   fun testController_logImportantEvent_withExplorationContext_checkLogsEvent() {
     analyticsController.logImportantEvent(
-      TEST_TIMESTAMP,
       oppiaLogger.createOpenExplorationActivityContext(
         TEST_TOPIC_ID,
         TEST_STORY_ID,
         TEST_EXPLORATION_ID
-      )
+      ),
+      profileId = null,
+      TEST_TIMESTAMP
     )
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasTimestampThat().isEqualTo(TEST_TIMESTAMP)
@@ -112,8 +134,9 @@ class AnalyticsControllerTest {
   @Test
   fun testController_logImportantEvent_withOpenInfoTabContext_checkLogsEvent() {
     analyticsController.logImportantEvent(
-      TEST_TIMESTAMP, oppiaLogger.createOpenInfoTabContext(TEST_TOPIC_ID)
+      oppiaLogger.createOpenInfoTabContext(TEST_TOPIC_ID), profileId = null, TEST_TIMESTAMP
     )
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasTimestampThat().isEqualTo(TEST_TIMESTAMP)
@@ -124,8 +147,9 @@ class AnalyticsControllerTest {
   @Test
   fun testController_logImportantEvent_withOpenPracticeTabContext_checkLogsEvent() {
     analyticsController.logImportantEvent(
-      TEST_TIMESTAMP, oppiaLogger.createOpenPracticeTabContext(TEST_TOPIC_ID)
+      oppiaLogger.createOpenPracticeTabContext(TEST_TOPIC_ID), profileId = null, TEST_TIMESTAMP
     )
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasTimestampThat().isEqualTo(TEST_TIMESTAMP)
@@ -136,8 +160,9 @@ class AnalyticsControllerTest {
   @Test
   fun testController_logImportantEvent_withOpenLessonsTabContext_checkLogsEvent() {
     analyticsController.logImportantEvent(
-      TEST_TIMESTAMP, oppiaLogger.createOpenLessonsTabContext(TEST_TOPIC_ID)
+      oppiaLogger.createOpenLessonsTabContext(TEST_TOPIC_ID), profileId = null, TEST_TIMESTAMP
     )
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasTimestampThat().isEqualTo(TEST_TIMESTAMP)
@@ -148,8 +173,9 @@ class AnalyticsControllerTest {
   @Test
   fun testController_logImportantEvent_withOpenRevisionTabContext_checkLogsEvent() {
     analyticsController.logImportantEvent(
-      TEST_TIMESTAMP, oppiaLogger.createOpenRevisionTabContext(TEST_TOPIC_ID)
+      oppiaLogger.createOpenRevisionTabContext(TEST_TOPIC_ID), profileId = null, TEST_TIMESTAMP
     )
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasTimestampThat().isEqualTo(TEST_TIMESTAMP)
@@ -160,8 +186,11 @@ class AnalyticsControllerTest {
   @Test
   fun testController_logImportantEvent_withStoryContext_checkLogsEvent() {
     analyticsController.logImportantEvent(
-      TEST_TIMESTAMP, oppiaLogger.createOpenStoryActivityContext(TEST_TOPIC_ID, TEST_STORY_ID)
+      oppiaLogger.createOpenStoryActivityContext(TEST_TOPIC_ID, TEST_STORY_ID),
+      profileId = null,
+      TEST_TIMESTAMP
     )
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasTimestampThat().isEqualTo(TEST_TIMESTAMP)
@@ -172,8 +201,11 @@ class AnalyticsControllerTest {
   @Test
   fun testController_logImportantEvent_withRevisionContext_checkLogsEvent() {
     analyticsController.logImportantEvent(
-      TEST_TIMESTAMP, oppiaLogger.createOpenRevisionCardContext(TEST_TOPIC_ID, TEST_SUB_TOPIC_ID)
+      oppiaLogger.createOpenRevisionCardContext(TEST_TOPIC_ID, TEST_SUB_TOPIC_ID),
+      profileId = null,
+      TEST_TIMESTAMP
     )
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasTimestampThat().isEqualTo(TEST_TIMESTAMP)
@@ -184,8 +216,9 @@ class AnalyticsControllerTest {
   @Test
   fun testController_logImportantEvent_withConceptCardContext_checkLogsEvent() {
     analyticsController.logImportantEvent(
-      TEST_TIMESTAMP, oppiaLogger.createOpenConceptCardContext(TEST_SKILL_ID)
+      oppiaLogger.createOpenConceptCardContext(TEST_SKILL_ID), profileId = null, TEST_TIMESTAMP
     )
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasTimestampThat().isEqualTo(TEST_TIMESTAMP)
@@ -193,17 +226,91 @@ class AnalyticsControllerTest {
     assertThat(eventLog).hasOpenConceptCardContext()
   }
 
+  @Test
+  fun testLogImportantEvent_forOpenHomeEvent_logsEssentialEventWithCurrentTime() {
+    val openHomeEventContext = oppiaLogger.createOpenHomeContext()
+
+    analyticsController.logImportantEvent(openHomeEventContext, profileId = null, TEST_TIMESTAMP)
+    testCoroutineDispatchers.runCurrent()
+
+    val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
+    assertThat(eventLog).isEssentialPriority()
+    assertThat(eventLog).hasTimestampThat().isEqualTo(TEST_TIMESTAMP)
+  }
+
+  @Test
+  fun testController_logImportantEvent_nullProfileId_hasDefaultLanguageSettings() {
+    val openHomeEventContext = oppiaLogger.createOpenHomeContext()
+    // Create a new profile & set its language settings, but don't use it when logging an event.
+    val profileId = addNewProfileAndLogIn()
+    ensureAppLanguageIsUpdatedTo(profileId, ENGLISH)
+    ensureWrittenTranslationsLanguageIsUpdatedTo(profileId, SWAHILI)
+    ensureAudioTranslationsLanguageIsUpdatedTo(profileId, HINGLISH)
+
+    analyticsController.logImportantEvent(openHomeEventContext, profileId = null, TEST_TIMESTAMP)
+    testCoroutineDispatchers.runCurrent()
+
+    // There are no language settings for an event logged that doesn't correspond to a profile.
+    val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
+    assertThat(eventLog).hasAppLanguageSelectionThat().isEqualToDefaultInstance()
+    assertThat(eventLog).hasWrittenTranslationLanguageSelectionThat().isEqualToDefaultInstance()
+    assertThat(eventLog).hasAudioTranslationLanguageSelectionThat().isEqualToDefaultInstance()
+  }
+
+  @Test
+  fun testController_logImportantEvent_profileWithNoLangSettings_hasDefaultLanguageSettings() {
+    val openHomeEventContext = oppiaLogger.createOpenHomeContext()
+    // Create a profile without any language settings.
+    val profileId = addNewProfileAndLogIn()
+
+    analyticsController.logImportantEvent(openHomeEventContext, profileId, TEST_TIMESTAMP)
+    testCoroutineDispatchers.runCurrent()
+
+    // If a profile corresponding to an event has no language settings, then the event shouldn't,
+    // either.
+    val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
+    assertThat(eventLog).hasAppLanguageSelectionThat().isEqualToDefaultInstance()
+    assertThat(eventLog).hasWrittenTranslationLanguageSelectionThat().isEqualToDefaultInstance()
+    assertThat(eventLog).hasAudioTranslationLanguageSelectionThat().isEqualToDefaultInstance()
+  }
+
+  @Test
+  fun testController_logImportantEvent_profileWithLangSettings_hasCorrectLanguageSettings() {
+    val openHomeEventContext = oppiaLogger.createOpenHomeContext()
+    val profileId = addNewProfileAndLogIn()
+    ensureAppLanguageIsUpdatedTo(profileId, ENGLISH)
+    ensureWrittenTranslationsLanguageIsUpdatedTo(profileId, SWAHILI)
+    ensureAudioTranslationsLanguageIsUpdatedTo(profileId, HINGLISH)
+
+    analyticsController.logImportantEvent(openHomeEventContext, profileId, TEST_TIMESTAMP)
+    testCoroutineDispatchers.runCurrent()
+
+    // A profile's language settings should reflect in corresponding logged events.
+    val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
+    assertThat(eventLog).hasAppLanguageSelectionThat().isSelectedLanguageThat().isEqualTo(ENGLISH)
+    assertThat(eventLog)
+      .hasWrittenTranslationLanguageSelectionThat()
+      .isSelectedLanguageThat()
+      .isEqualTo(SWAHILI)
+    assertThat(eventLog)
+      .hasAudioTranslationLanguageSelectionThat()
+      .isSelectedLanguageThat()
+      .isEqualTo(HINGLISH)
+  }
+
   @Test
   fun testController_logLowPriorityEvent_withQuestionContext_checkLogsEvent() {
     analyticsController.logLowPriorityEvent(
-      TEST_TIMESTAMP,
       oppiaLogger.createOpenQuestionPlayerContext(
         TEST_QUESTION_ID,
         listOf(
           TEST_SKILL_LIST_ID, TEST_SKILL_LIST_ID
         )
-      )
+      ),
+      profileId = null,
+      TEST_TIMESTAMP
     )
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasTimestampThat().isEqualTo(TEST_TIMESTAMP)
@@ -214,13 +321,15 @@ class AnalyticsControllerTest {
   @Test
   fun testController_logLowPriorityEvent_withExplorationContext_checkLogsEvent() {
     analyticsController.logLowPriorityEvent(
-      TEST_TIMESTAMP,
       oppiaLogger.createOpenExplorationActivityContext(
         TEST_TOPIC_ID,
         TEST_STORY_ID,
         TEST_EXPLORATION_ID
-      )
+      ),
+      profileId = null,
+      TEST_TIMESTAMP
     )
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasTimestampThat().isEqualTo(TEST_TIMESTAMP)
@@ -231,8 +340,9 @@ class AnalyticsControllerTest {
   @Test
   fun testController_logLowPriorityEvent_withOpenInfoTabContext_checkLogsEvent() {
     analyticsController.logLowPriorityEvent(
-      TEST_TIMESTAMP, oppiaLogger.createOpenInfoTabContext(TEST_TOPIC_ID)
+      oppiaLogger.createOpenInfoTabContext(TEST_TOPIC_ID), profileId = null, TEST_TIMESTAMP
     )
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasTimestampThat().isEqualTo(TEST_TIMESTAMP)
@@ -243,8 +353,9 @@ class AnalyticsControllerTest {
   @Test
   fun testController_logLowPriorityEvent_withOpenPracticeTabContext_checkLogsEvent() {
     analyticsController.logLowPriorityEvent(
-      TEST_TIMESTAMP, oppiaLogger.createOpenPracticeTabContext(TEST_TOPIC_ID)
+      oppiaLogger.createOpenPracticeTabContext(TEST_TOPIC_ID), profileId = null, TEST_TIMESTAMP
     )
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasTimestampThat().isEqualTo(TEST_TIMESTAMP)
@@ -255,8 +366,9 @@ class AnalyticsControllerTest {
   @Test
   fun testController_logLowPriorityEvent_withOpenLessonsTabContext_checkLogsEvent() {
     analyticsController.logLowPriorityEvent(
-      TEST_TIMESTAMP, oppiaLogger.createOpenLessonsTabContext(TEST_TOPIC_ID)
+      oppiaLogger.createOpenLessonsTabContext(TEST_TOPIC_ID), profileId = null, TEST_TIMESTAMP
     )
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasTimestampThat().isEqualTo(TEST_TIMESTAMP)
@@ -267,8 +379,9 @@ class AnalyticsControllerTest {
   @Test
   fun testController_logLowPriorityEvent_withOpenRevisionTabContext_checkLogsEvent() {
     analyticsController.logLowPriorityEvent(
-      TEST_TIMESTAMP, oppiaLogger.createOpenRevisionTabContext(TEST_TOPIC_ID)
+      oppiaLogger.createOpenRevisionTabContext(TEST_TOPIC_ID), profileId = null, TEST_TIMESTAMP
     )
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasTimestampThat().isEqualTo(TEST_TIMESTAMP)
@@ -279,8 +392,11 @@ class AnalyticsControllerTest {
   @Test
   fun testController_logLowPriorityEvent_withStoryContext_checkLogsEvent() {
     analyticsController.logLowPriorityEvent(
-      TEST_TIMESTAMP, oppiaLogger.createOpenStoryActivityContext(TEST_TOPIC_ID, TEST_STORY_ID)
+      oppiaLogger.createOpenStoryActivityContext(TEST_TOPIC_ID, TEST_STORY_ID),
+      profileId = null,
+      TEST_TIMESTAMP
     )
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasTimestampThat().isEqualTo(TEST_TIMESTAMP)
@@ -291,8 +407,11 @@ class AnalyticsControllerTest {
   @Test
   fun testController_logLowPriorityEvent_withRevisionContext_checkLogsEvent() {
     analyticsController.logLowPriorityEvent(
-      TEST_TIMESTAMP, oppiaLogger.createOpenRevisionCardContext(TEST_TOPIC_ID, TEST_SUB_TOPIC_ID)
+      oppiaLogger.createOpenRevisionCardContext(TEST_TOPIC_ID, TEST_SUB_TOPIC_ID),
+      profileId = null,
+      TEST_TIMESTAMP
     )
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasTimestampThat().isEqualTo(TEST_TIMESTAMP)
@@ -303,8 +422,9 @@ class AnalyticsControllerTest {
   @Test
   fun testController_logLowPriorityEvent_withConceptCardContext_checkLogsEvent() {
     analyticsController.logLowPriorityEvent(
-      TEST_TIMESTAMP, oppiaLogger.createOpenConceptCardContext(TEST_SKILL_ID)
+      oppiaLogger.createOpenConceptCardContext(TEST_SKILL_ID), profileId = null, TEST_TIMESTAMP
     )
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasTimestampThat().isEqualTo(TEST_TIMESTAMP)
@@ -319,14 +439,16 @@ class AnalyticsControllerTest {
   fun testController_logImportantEvent_withNoNetwork_checkLogsEventToStore() {
     networkConnectionUtil.setCurrentConnectionStatus(NONE)
     analyticsController.logImportantEvent(
-      TEST_TIMESTAMP,
       oppiaLogger.createOpenQuestionPlayerContext(
         TEST_QUESTION_ID,
         listOf(
           TEST_SKILL_LIST_ID, TEST_SKILL_LIST_ID
         )
-      )
+      ),
+      profileId = null,
+      TEST_TIMESTAMP
     )
+    testCoroutineDispatchers.runCurrent()
 
     val eventLogsProvider = analyticsController.getEventLogStore()
 
@@ -340,14 +462,16 @@ class AnalyticsControllerTest {
   fun testController_logLowPriorityEvent_withNoNetwork_checkLogsEventToStore() {
     networkConnectionUtil.setCurrentConnectionStatus(NONE)
     analyticsController.logLowPriorityEvent(
-      TEST_TIMESTAMP,
       oppiaLogger.createOpenQuestionPlayerContext(
         TEST_QUESTION_ID,
         listOf(
           TEST_SKILL_LIST_ID, TEST_SKILL_LIST_ID
         )
-      )
+      ),
+      profileId = null,
+      TEST_TIMESTAMP
     )
+    testCoroutineDispatchers.runCurrent()
 
     val eventLogsProvider = analyticsController.getEventLogStore()
 
@@ -357,6 +481,66 @@ class AnalyticsControllerTest {
     assertThat(eventLog).hasOpenQuestionPlayerContext()
   }
 
+  @Test
+  fun testController_logLowPriorityEvent_nullProfileId_hasDefaultLanguageSettings() {
+    val openHomeEventContext = oppiaLogger.createOpenHomeContext()
+    // Create a new profile & set its language settings, but don't use it when logging an event.
+    val profileId = addNewProfileAndLogIn()
+    ensureAppLanguageIsUpdatedTo(profileId, ENGLISH)
+    ensureWrittenTranslationsLanguageIsUpdatedTo(profileId, SWAHILI)
+    ensureAudioTranslationsLanguageIsUpdatedTo(profileId, HINGLISH)
+
+    analyticsController.logLowPriorityEvent(openHomeEventContext, profileId = null, TEST_TIMESTAMP)
+    testCoroutineDispatchers.runCurrent()
+
+    // There are no language settings for an event logged that doesn't correspond to a profile.
+    val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
+    assertThat(eventLog).hasAppLanguageSelectionThat().isEqualToDefaultInstance()
+    assertThat(eventLog).hasWrittenTranslationLanguageSelectionThat().isEqualToDefaultInstance()
+    assertThat(eventLog).hasAudioTranslationLanguageSelectionThat().isEqualToDefaultInstance()
+  }
+
+  @Test
+  fun testController_logLowPriorityEvent_profileWithNoLangSettings_hasDefaultLanguageSettings() {
+    val openHomeEventContext = oppiaLogger.createOpenHomeContext()
+    // Create a profile without any language settings.
+    val profileId = addNewProfileAndLogIn()
+
+    analyticsController.logLowPriorityEvent(openHomeEventContext, profileId, TEST_TIMESTAMP)
+    testCoroutineDispatchers.runCurrent()
+
+    // If a profile corresponding to an event has no language settings, then the event shouldn't,
+    // either.
+    val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
+    assertThat(eventLog).hasAppLanguageSelectionThat().isEqualToDefaultInstance()
+    assertThat(eventLog).hasWrittenTranslationLanguageSelectionThat().isEqualToDefaultInstance()
+    assertThat(eventLog).hasAudioTranslationLanguageSelectionThat().isEqualToDefaultInstance()
+  }
+
+  @Test
+  fun testController_logLowPriorityEvent_profileWithLangSettings_hasCorrectLanguageSettings() {
+    val openHomeEventContext = oppiaLogger.createOpenHomeContext()
+    val profileId = addNewProfileAndLogIn()
+    ensureAppLanguageIsUpdatedTo(profileId, ENGLISH)
+    ensureWrittenTranslationsLanguageIsUpdatedTo(profileId, SWAHILI)
+    ensureAudioTranslationsLanguageIsUpdatedTo(profileId, HINGLISH)
+
+    analyticsController.logLowPriorityEvent(openHomeEventContext, profileId, TEST_TIMESTAMP)
+    testCoroutineDispatchers.runCurrent()
+
+    // A profile's language settings should reflect in corresponding logged events.
+    val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
+    assertThat(eventLog).hasAppLanguageSelectionThat().isSelectedLanguageThat().isEqualTo(ENGLISH)
+    assertThat(eventLog)
+      .hasWrittenTranslationLanguageSelectionThat()
+      .isSelectedLanguageThat()
+      .isEqualTo(SWAHILI)
+    assertThat(eventLog)
+      .hasAudioTranslationLanguageSelectionThat()
+      .isSelectedLanguageThat()
+      .isEqualTo(HINGLISH)
+  }
+
   @Test
   fun testController_logImportantEvent_withNoNetwork_exceedLimit_checkEventLogStoreSize() {
     networkConnectionUtil.setCurrentConnectionStatus(NONE)
@@ -372,23 +556,27 @@ class AnalyticsControllerTest {
   fun testController_logImportantEvent_logLowPriorityEvent_withNoNetwork_checkOrderinCache() {
     networkConnectionUtil.setCurrentConnectionStatus(NONE)
     analyticsController.logLowPriorityEvent(
-      TEST_TIMESTAMP,
       oppiaLogger.createOpenQuestionPlayerContext(
         TEST_QUESTION_ID,
         listOf(
           TEST_SKILL_LIST_ID, TEST_SKILL_LIST_ID
         )
-      )
+      ),
+      profileId = null,
+      TEST_TIMESTAMP
     )
+    testCoroutineDispatchers.runCurrent()
     analyticsController.logImportantEvent(
-      TEST_TIMESTAMP,
       oppiaLogger.createOpenQuestionPlayerContext(
         TEST_QUESTION_ID,
         listOf(
           TEST_SKILL_LIST_ID, TEST_SKILL_LIST_ID
         )
-      )
+      ),
+      profileId = null,
+      TEST_TIMESTAMP
     )
+    testCoroutineDispatchers.runCurrent()
 
     val eventLogsProvider = analyticsController.getEventLogStore()
 
@@ -403,24 +591,28 @@ class AnalyticsControllerTest {
   @Test
   fun testController_logImportantEvent_switchToNoNetwork_logLowPriorityEvent_checkManagement() {
     analyticsController.logImportantEvent(
-      TEST_TIMESTAMP,
       oppiaLogger.createOpenQuestionPlayerContext(
         TEST_QUESTION_ID,
         listOf(
           TEST_SKILL_LIST_ID, TEST_SKILL_LIST_ID
         )
-      )
+      ),
+      profileId = null,
+      TEST_TIMESTAMP
     )
+    testCoroutineDispatchers.runCurrent()
     networkConnectionUtil.setCurrentConnectionStatus(NONE)
     analyticsController.logLowPriorityEvent(
-      TEST_TIMESTAMP,
       oppiaLogger.createOpenQuestionPlayerContext(
         TEST_QUESTION_ID,
         listOf(
           TEST_SKILL_LIST_ID, TEST_SKILL_LIST_ID
         )
-      )
+      ),
+      profileId = null,
+      TEST_TIMESTAMP
     )
+    testCoroutineDispatchers.runCurrent()
 
     val logsProvider = analyticsController.getEventLogStore()
 
@@ -466,28 +658,32 @@ class AnalyticsControllerTest {
   fun testController_logEvent_withoutNetwork_verifySyncStatusIsUnchanged() {
     networkConnectionUtil.setCurrentConnectionStatus(NONE)
     analyticsController.logImportantEvent(
-      1556094120000,
       oppiaLogger.createOpenQuestionPlayerContext(
         TEST_QUESTION_ID,
         listOf(
           TEST_SKILL_LIST_ID, TEST_SKILL_LIST_ID
         )
-      )
+      ),
+      profileId = null,
+      1556094120000
     )
+    testCoroutineDispatchers.runCurrent()
     assertThat(fakeSyncStatusManager.getSyncStatuses()).containsExactly(NO_CONNECTIVITY)
   }
 
   @Test
   fun testController_logEvent_verifySyncStatusChangesToRepresentLoggedEvent() {
     analyticsController.logImportantEvent(
-      1556094120000,
       oppiaLogger.createOpenQuestionPlayerContext(
         TEST_QUESTION_ID,
         listOf(
           TEST_SKILL_LIST_ID, TEST_SKILL_LIST_ID
         )
-      )
+      ),
+      profileId = null,
+      1556094120000
     )
+    testCoroutineDispatchers.runCurrent()
 
     val syncStatuses = fakeSyncStatusManager.getSyncStatuses()
     assertThat(syncStatuses).containsExactly(DATA_UPLOADING, DATA_UPLOADED)
@@ -499,44 +695,105 @@ class AnalyticsControllerTest {
 
   private fun logMultipleEvents() {
     analyticsController.logImportantEvent(
-      1556094120000,
       oppiaLogger.createOpenQuestionPlayerContext(
         TEST_QUESTION_ID,
         listOf(
           TEST_SKILL_LIST_ID, TEST_SKILL_LIST_ID
         )
-      )
+      ),
+      profileId = null,
+      1556094120000
     )
+    testCoroutineDispatchers.runCurrent()
 
     analyticsController.logLowPriorityEvent(
-      1556094110000,
       oppiaLogger.createOpenQuestionPlayerContext(
         TEST_QUESTION_ID,
         listOf(
           TEST_SKILL_LIST_ID, TEST_SKILL_LIST_ID
         )
-      )
+      ),
+      profileId = null,
+      1556094110000
     )
+    testCoroutineDispatchers.runCurrent()
 
     analyticsController.logImportantEvent(
-      1556093100000,
       oppiaLogger.createOpenQuestionPlayerContext(
         TEST_QUESTION_ID,
         listOf(
           TEST_SKILL_LIST_ID, TEST_SKILL_LIST_ID
         )
-      )
+      ),
+      profileId = null,
+      1556093100000
     )
+    testCoroutineDispatchers.runCurrent()
 
     analyticsController.logImportantEvent(
-      1556094100000,
       oppiaLogger.createOpenQuestionPlayerContext(
         TEST_QUESTION_ID,
         listOf(
           TEST_SKILL_LIST_ID, TEST_SKILL_LIST_ID
         )
-      )
+      ),
+      profileId = null,
+      1556094100000
     )
+    testCoroutineDispatchers.runCurrent()
+  }
+
+  private fun addNewProfileAndLogIn(): ProfileId {
+    val addProfileProvider = profileManagementController.addProfile(
+      name = "Test Profile",
+      pin = "",
+      avatarImagePath = null,
+      allowDownloadAccess = false,
+      colorRgb = 0,
+      isAdmin = false
+    )
+    monitorFactory.ensureDataProviderExecutes(addProfileProvider)
+
+    return ProfileId.newBuilder().apply { internalId = 0 }.build().also { expectedProfileId ->
+      val logInProvider = profileManagementController.loginToProfile(expectedProfileId)
+      monitorFactory.waitForNextSuccessfulResult(logInProvider) // Ensure that the login succeeds.
+    }
+  }
+
+  private fun ensureAppLanguageIsUpdatedTo(profileId: ProfileId, language: OppiaLanguage) {
+    val resultProvider =
+      translationController.updateAppLanguage(
+        profileId, AppLanguageSelection.newBuilder().apply { selectedLanguage = language }.build()
+      )
+    monitorFactory.waitForNextSuccessfulResult(resultProvider)
+  }
+
+  private fun ensureWrittenTranslationsLanguageIsUpdatedTo(
+    profileId: ProfileId,
+    language: OppiaLanguage
+  ) {
+    val resultProvider =
+      translationController.updateWrittenTranslationContentLanguage(
+        profileId,
+        WrittenTranslationLanguageSelection.newBuilder().apply {
+          selectedLanguage = language
+        }.build()
+      )
+    monitorFactory.waitForNextSuccessfulResult(resultProvider)
+  }
+
+  private fun ensureAudioTranslationsLanguageIsUpdatedTo(
+    profileId: ProfileId,
+    language: OppiaLanguage
+  ) {
+    val resultProvider =
+      translationController.updateAudioTranslationContentLanguage(
+        profileId,
+        AudioTranslationLanguageSelection.newBuilder().apply {
+          selectedLanguage = language
+        }.build()
+      )
+    monitorFactory.waitForNextSuccessfulResult(resultProvider)
   }
 
   // TODO(#89): Move this to a common test application component.
@@ -565,10 +822,17 @@ class AnalyticsControllerTest {
 
   @Module
   class TestLogStorageModule {
-
     @Provides
     @EventLogStorageCacheSize
     fun provideEventLogStorageCacheSize(): Int = 2
+
+    @Provides
+    @ExceptionLogStorageCacheSize
+    fun provideExceptionLogStorageCacheSize(): Int = 2
+
+    @Provides
+    @PerformanceMetricsLogStorageCacheSize
+    fun provideMetricLogStorageCacheSize(): Int = 10
   }
 
   // TODO(#89): Move this to a common test application component.
@@ -579,7 +843,7 @@ class AnalyticsControllerTest {
       TestDispatcherModule::class, TestLogStorageModule::class,
       NetworkConnectionUtilDebugModule::class, LocaleProdModule::class, FakeOppiaClockModule::class,
       PlatformParameterModule::class, PlatformParameterSingletonModule::class,
-      LoggingIdentifierModule::class, SyncStatusTestModule::class
+      LoggingIdentifierModule::class, SyncStatusTestModule::class, AssetModule::class
     ]
   )
   interface TestApplicationComponent : DataProvidersInjector {
diff --git a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel
index 4f297af4edb..4edf8ffe1ce 100644
--- a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel
+++ b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel
@@ -30,6 +30,7 @@ oppia_android_test(
         "//third_party:org_mockito_mockito-core",
         "//third_party:org_robolectric_robolectric",
         "//third_party:robolectric_android-all",
+        "//utility/src/main/java/org/oppia/android/util/caching:asset_prod_module",
         "//utility/src/main/java/org/oppia/android/util/locale:prod_module",
         "//utility/src/main/java/org/oppia/android/util/networking:debug_module",
     ],
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 09a9cf25c8c..363161e6b57 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
@@ -14,6 +14,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.oppia.android.app.model.Exploration
 import org.oppia.android.app.model.Interaction
+import org.oppia.android.app.model.OppiaLanguage
 import org.oppia.android.app.model.ProfileId
 import org.oppia.android.app.model.UserAnswer
 import org.oppia.android.domain.classify.InteractionsModule
@@ -52,6 +53,7 @@ import org.oppia.android.testing.junit.ParameterizedRobolectricTestRunner
 import org.oppia.android.testing.logging.EventLogSubject.Companion.assertThat
 import org.oppia.android.testing.logging.SyncStatusTestModule
 import org.oppia.android.testing.robolectric.RobolectricModule
+import org.oppia.android.testing.threading.TestCoroutineDispatchers
 import org.oppia.android.testing.threading.TestDispatcherModule
 import org.oppia.android.testing.time.FakeOppiaClockModule
 import org.oppia.android.util.caching.AssetModule
@@ -90,6 +92,7 @@ class LearnerAnalyticsLoggerTest {
   @Inject lateinit var explorationDataController: ExplorationDataController
   @Inject lateinit var monitorFactory: DataProviderTestMonitor.Factory
   @Inject lateinit var fakeAnalyticsEventLogger: FakeAnalyticsEventLogger
+  @Inject lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
 
   @Parameter lateinit var iid: String
   @Parameter lateinit var lid: String
@@ -121,6 +124,7 @@ class LearnerAnalyticsLoggerTest {
     val exploration = loadExploration(TEST_EXPLORATION_ID_5)
 
     val logger = learnerAnalyticsLogger.beginExploration(exploration)
+    testCoroutineDispatchers.runCurrent()
 
     assertThat(logger).isNotNull()
   }
@@ -130,6 +134,7 @@ class LearnerAnalyticsLoggerTest {
     val exploration = loadExploration(TEST_EXPLORATION_ID_5)
 
     learnerAnalyticsLogger.beginExploration(exploration)
+    testCoroutineDispatchers.runCurrent()
 
     assertThat(fakeAnalyticsEventLogger.noEventsPresent()).isTrue()
   }
@@ -139,6 +144,7 @@ class LearnerAnalyticsLoggerTest {
     val exploration = loadExploration(TEST_EXPLORATION_ID_5)
 
     val logger = learnerAnalyticsLogger.beginExploration(exploration)
+    testCoroutineDispatchers.runCurrent()
 
     assertThat(learnerAnalyticsLogger.explorationAnalyticsLogger.value).isEqualTo(logger)
   }
@@ -148,8 +154,10 @@ class LearnerAnalyticsLoggerTest {
     val exploration2 = loadExploration(TEST_EXPLORATION_ID_2)
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val firstLogger = learnerAnalyticsLogger.beginExploration(exploration2)
+    testCoroutineDispatchers.runCurrent()
 
     val secondLogger = learnerAnalyticsLogger.beginExploration(exploration5)
+    testCoroutineDispatchers.runCurrent()
 
     assertThat(firstLogger).isNotEqualTo(secondLogger)
   }
@@ -160,6 +168,7 @@ class LearnerAnalyticsLoggerTest {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
 
     val logger = learnerAnalyticsLogger.beginExploration(exploration5)
+    testCoroutineDispatchers.runCurrent()
 
     assertThat(learnerAnalyticsLogger.explorationAnalyticsLogger.value).isEqualTo(logger)
   }
@@ -167,8 +176,10 @@ class LearnerAnalyticsLoggerTest {
   @Test
   fun testBeginExploration_withOngoingSession_logsConsoleWarning() {
     learnerAnalyticsLogger.beginExploration(loadExploration(TEST_EXPLORATION_ID_2))
+    testCoroutineDispatchers.runCurrent()
 
     learnerAnalyticsLogger.beginExploration(loadExploration(TEST_EXPLORATION_ID_5))
+    testCoroutineDispatchers.runCurrent()
 
     val log = ShadowLog.getLogs().getMostRecentWithTag("LearnerAnalyticsLogger")
     assertThat(log.msg).contains("Attempting to start an exploration without ending the previous")
@@ -178,6 +189,7 @@ class LearnerAnalyticsLoggerTest {
   @Test
   fun testEndExploration_noOngoingSession_logsConsoleWarning() {
     learnerAnalyticsLogger.endExploration()
+    testCoroutineDispatchers.runCurrent()
 
     val log = ShadowLog.getLogs().getMostRecentWithTag("LearnerAnalyticsLogger")
     assertThat(log.msg).contains("Attempting to end an exploration that hasn't been started")
@@ -187,8 +199,10 @@ class LearnerAnalyticsLoggerTest {
   @Test
   fun testEndExploration_ongoingSession_setsGlobalAnalyticsLoggerToNull() {
     learnerAnalyticsLogger.beginExploration(loadExploration(TEST_EXPLORATION_ID_5))
+    testCoroutineDispatchers.runCurrent()
 
     learnerAnalyticsLogger.endExploration()
+    testCoroutineDispatchers.runCurrent()
 
     assertThat(learnerAnalyticsLogger.explorationAnalyticsLogger.value).isNull()
   }
@@ -196,15 +210,18 @@ class LearnerAnalyticsLoggerTest {
   @Test
   fun testEndExploration_ongoingSession_doesNotLogEvent() {
     learnerAnalyticsLogger.beginExploration(loadExploration(TEST_EXPLORATION_ID_5))
+    testCoroutineDispatchers.runCurrent()
 
     learnerAnalyticsLogger.endExploration()
+    testCoroutineDispatchers.runCurrent()
 
     assertThat(fakeAnalyticsEventLogger.noEventsPresent()).isTrue()
   }
 
   @Test
   fun testLogAppInBackground_noOngoingSession_logsEventWithIds() {
-    learnerAnalyticsLogger.logAppInBackground(TEST_INSTALL_ID, TEST_LEARNER_ID)
+    learnerAnalyticsLogger.logAppInBackground(TEST_INSTALL_ID, profileId, TEST_LEARNER_ID)
+    testCoroutineDispatchers.runCurrent()
 
     val event = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(event).isEssentialPriority()
@@ -217,8 +234,10 @@ class LearnerAnalyticsLoggerTest {
   @Test
   fun testLogAppInBackground_ongoingSession_logsEventWithIds() {
     learnerAnalyticsLogger.beginExploration(loadExploration(TEST_EXPLORATION_ID_5))
+    testCoroutineDispatchers.runCurrent()
 
-    learnerAnalyticsLogger.logAppInBackground(TEST_INSTALL_ID, TEST_LEARNER_ID)
+    learnerAnalyticsLogger.logAppInBackground(TEST_INSTALL_ID, profileId, TEST_LEARNER_ID)
+    testCoroutineDispatchers.runCurrent()
 
     val event = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(event).isEssentialPriority()
@@ -230,7 +249,8 @@ class LearnerAnalyticsLoggerTest {
 
   @Test
   fun testLogAppInBackground_withoutInstallationId_logsEventWithoutInstallationId() {
-    learnerAnalyticsLogger.logAppInBackground(installationId = null, TEST_LEARNER_ID)
+    learnerAnalyticsLogger.logAppInBackground(installationId = null, profileId, TEST_LEARNER_ID)
+    testCoroutineDispatchers.runCurrent()
 
     assertThat(fakeAnalyticsEventLogger.getMostRecentEvent()).hasAppInBackgroundContextThat {
       hasLearnerIdThat().isNotEmpty()
@@ -240,7 +260,8 @@ class LearnerAnalyticsLoggerTest {
 
   @Test
   fun testLogAppInBackground_withoutLearnerId_logsEventWithoutLearnerId() {
-    learnerAnalyticsLogger.logAppInBackground(TEST_INSTALL_ID, learnerId = null)
+    learnerAnalyticsLogger.logAppInBackground(TEST_INSTALL_ID, profileId, learnerId = null)
+    testCoroutineDispatchers.runCurrent()
 
     assertThat(fakeAnalyticsEventLogger.getMostRecentEvent()).hasAppInBackgroundContextThat {
       hasLearnerIdThat().isEmpty()
@@ -250,7 +271,8 @@ class LearnerAnalyticsLoggerTest {
 
   @Test
   fun testLogAppInBackground_withoutIds_logsEventWithoutIds() {
-    learnerAnalyticsLogger.logAppInBackground(installationId = null, learnerId = null)
+    learnerAnalyticsLogger.logAppInBackground(installationId = null, profileId, learnerId = null)
+    testCoroutineDispatchers.runCurrent()
 
     val event = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(event).hasAppInBackgroundContextThat().isEqualToDefaultInstance()
@@ -258,7 +280,8 @@ class LearnerAnalyticsLoggerTest {
 
   @Test
   fun testLogAppInForeground_noOngoingSession_logsEventWithIds() {
-    learnerAnalyticsLogger.logAppInForeground(TEST_INSTALL_ID, TEST_LEARNER_ID)
+    learnerAnalyticsLogger.logAppInForeground(TEST_INSTALL_ID, profileId, TEST_LEARNER_ID)
+    testCoroutineDispatchers.runCurrent()
 
     val event = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(event).isEssentialPriority()
@@ -271,8 +294,10 @@ class LearnerAnalyticsLoggerTest {
   @Test
   fun testLogAppInForeground_ongoingSession_logsEventWithIds() {
     learnerAnalyticsLogger.beginExploration(loadExploration(TEST_EXPLORATION_ID_5))
+    testCoroutineDispatchers.runCurrent()
 
-    learnerAnalyticsLogger.logAppInForeground(TEST_INSTALL_ID, TEST_LEARNER_ID)
+    learnerAnalyticsLogger.logAppInForeground(TEST_INSTALL_ID, profileId, TEST_LEARNER_ID)
+    testCoroutineDispatchers.runCurrent()
 
     val event = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(event).isEssentialPriority()
@@ -284,7 +309,8 @@ class LearnerAnalyticsLoggerTest {
 
   @Test
   fun testLogAppInForeground_withoutInstallationId_logsEventWithoutInstallationId() {
-    learnerAnalyticsLogger.logAppInForeground(installationId = null, TEST_LEARNER_ID)
+    learnerAnalyticsLogger.logAppInForeground(installationId = null, profileId, TEST_LEARNER_ID)
+    testCoroutineDispatchers.runCurrent()
 
     assertThat(fakeAnalyticsEventLogger.getMostRecentEvent()).hasAppInForegroundContextThat {
       hasLearnerIdThat().isNotEmpty()
@@ -294,7 +320,8 @@ class LearnerAnalyticsLoggerTest {
 
   @Test
   fun testLogAppInForeground_withoutLearnerId_logsEventWithoutLearnerId() {
-    learnerAnalyticsLogger.logAppInForeground(TEST_INSTALL_ID, learnerId = null)
+    learnerAnalyticsLogger.logAppInForeground(TEST_INSTALL_ID, profileId, learnerId = null)
+    testCoroutineDispatchers.runCurrent()
 
     assertThat(fakeAnalyticsEventLogger.getMostRecentEvent()).hasAppInForegroundContextThat {
       hasLearnerIdThat().isEmpty()
@@ -304,7 +331,8 @@ class LearnerAnalyticsLoggerTest {
 
   @Test
   fun testLogAppInForeground_withoutIds_logsEventWithoutIds() {
-    learnerAnalyticsLogger.logAppInForeground(installationId = null, learnerId = null)
+    learnerAnalyticsLogger.logAppInForeground(installationId = null, profileId, learnerId = null)
+    testCoroutineDispatchers.runCurrent()
 
     val event = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(event).hasAppInForegroundContextThat().isEqualToDefaultInstance()
@@ -312,7 +340,8 @@ class LearnerAnalyticsLoggerTest {
 
   @Test
   fun testLogDeleteProfile_noOngoingSession_logsEventWithIds() {
-    learnerAnalyticsLogger.logDeleteProfile(TEST_INSTALL_ID, TEST_LEARNER_ID)
+    learnerAnalyticsLogger.logDeleteProfile(TEST_INSTALL_ID, profileId, TEST_LEARNER_ID)
+    testCoroutineDispatchers.runCurrent()
 
     val event = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(event).isEssentialPriority()
@@ -325,8 +354,10 @@ class LearnerAnalyticsLoggerTest {
   @Test
   fun testLogDeleteProfile_ongoingSession_logsEventWithIds() {
     learnerAnalyticsLogger.beginExploration(loadExploration(TEST_EXPLORATION_ID_5))
+    testCoroutineDispatchers.runCurrent()
 
-    learnerAnalyticsLogger.logDeleteProfile(TEST_INSTALL_ID, TEST_LEARNER_ID)
+    learnerAnalyticsLogger.logDeleteProfile(TEST_INSTALL_ID, profileId, TEST_LEARNER_ID)
+    testCoroutineDispatchers.runCurrent()
 
     val event = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(event).isEssentialPriority()
@@ -338,7 +369,8 @@ class LearnerAnalyticsLoggerTest {
 
   @Test
   fun testLogDeleteProfile_withoutInstallationId_logsEventWithoutInstallationId() {
-    learnerAnalyticsLogger.logDeleteProfile(installationId = null, TEST_LEARNER_ID)
+    learnerAnalyticsLogger.logDeleteProfile(installationId = null, profileId, TEST_LEARNER_ID)
+    testCoroutineDispatchers.runCurrent()
 
     assertThat(fakeAnalyticsEventLogger.getMostRecentEvent()).hasDeleteProfileContextThat {
       hasLearnerIdThat().isNotEmpty()
@@ -348,7 +380,8 @@ class LearnerAnalyticsLoggerTest {
 
   @Test
   fun testLogDeleteProfile_withoutLearnerId_logsEventWithoutLearnerId() {
-    learnerAnalyticsLogger.logDeleteProfile(TEST_INSTALL_ID, learnerId = null)
+    learnerAnalyticsLogger.logDeleteProfile(TEST_INSTALL_ID, profileId, learnerId = null)
+    testCoroutineDispatchers.runCurrent()
 
     assertThat(fakeAnalyticsEventLogger.getMostRecentEvent()).hasDeleteProfileContextThat {
       hasLearnerIdThat().isEmpty()
@@ -358,7 +391,8 @@ class LearnerAnalyticsLoggerTest {
 
   @Test
   fun testLogDeleteProfile_withoutIds_logsEventWithoutIds() {
-    learnerAnalyticsLogger.logDeleteProfile(installationId = null, learnerId = null)
+    learnerAnalyticsLogger.logDeleteProfile(installationId = null, profileId, learnerId = null)
+    testCoroutineDispatchers.runCurrent()
 
     val event = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(event).hasDeleteProfileContextThat().isEqualToDefaultInstance()
@@ -367,6 +401,7 @@ class LearnerAnalyticsLoggerTest {
   @Test
   fun testExpLogger_afterStarting_stateLoggerIsNull() {
     val expLogger = learnerAnalyticsLogger.beginExploration(loadExploration(TEST_EXPLORATION_ID_5))
+    testCoroutineDispatchers.runCurrent()
 
     assertThat(expLogger.stateAnalyticsLogger.value).isNull()
   }
@@ -376,8 +411,10 @@ class LearnerAnalyticsLoggerTest {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val initState = exploration5.getStateByName(exploration5.initStateName)
     val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
+    testCoroutineDispatchers.runCurrent()
 
     val stateLogger = expLogger.startCard(initState)
+    testCoroutineDispatchers.runCurrent()
 
     assertThat(stateLogger).isNotNull()
   }
@@ -387,8 +424,10 @@ class LearnerAnalyticsLoggerTest {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val initState = exploration5.getStateByName(exploration5.initStateName)
     val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
+    testCoroutineDispatchers.runCurrent()
 
     expLogger.startCard(initState)
+    testCoroutineDispatchers.runCurrent()
 
     assertThat(fakeAnalyticsEventLogger.noEventsPresent()).isTrue()
   }
@@ -398,8 +437,10 @@ class LearnerAnalyticsLoggerTest {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val initState = exploration5.getStateByName(exploration5.initStateName)
     val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
+    testCoroutineDispatchers.runCurrent()
 
     val stateLogger = expLogger.startCard(initState)
+    testCoroutineDispatchers.runCurrent()
 
     assertThat(expLogger.stateAnalyticsLogger.value).isEqualTo(stateLogger)
   }
@@ -411,8 +452,10 @@ class LearnerAnalyticsLoggerTest {
     val fourthState = exploration5.getStateByName(TEST_EXP_5_STATE_FOUR_NAME)
     val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
     val stateLogger3 = expLogger.startCard(thirdState)
+    testCoroutineDispatchers.runCurrent()
 
     val stateLogger4 = expLogger.startCard(fourthState)
+    testCoroutineDispatchers.runCurrent()
 
     assertThat(stateLogger3).isNotEqualTo(stateLogger4)
   }
@@ -423,9 +466,12 @@ class LearnerAnalyticsLoggerTest {
     val thirdState = exploration5.getStateByName(TEST_EXP_5_STATE_THREE_NAME)
     val fourthState = exploration5.getStateByName(TEST_EXP_5_STATE_FOUR_NAME)
     val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
+    testCoroutineDispatchers.runCurrent()
     expLogger.startCard(thirdState)
+    testCoroutineDispatchers.runCurrent()
 
     val stateLogger = expLogger.startCard(fourthState)
+    testCoroutineDispatchers.runCurrent()
 
     assertThat(expLogger.stateAnalyticsLogger.value).isEqualTo(stateLogger)
   }
@@ -436,9 +482,12 @@ class LearnerAnalyticsLoggerTest {
     val thirdState = exploration5.getStateByName(TEST_EXP_5_STATE_THREE_NAME)
     val fourthState = exploration5.getStateByName(TEST_EXP_5_STATE_FOUR_NAME)
     val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
+    testCoroutineDispatchers.runCurrent()
     expLogger.startCard(thirdState)
+    testCoroutineDispatchers.runCurrent()
 
     expLogger.startCard(fourthState)
+    testCoroutineDispatchers.runCurrent()
 
     val log = ShadowLog.getLogs().getMostRecentWithTag("LearnerAnalyticsLogger")
     assertThat(log.msg).contains("Attempting to start a card without ending the previous")
@@ -449,8 +498,10 @@ class LearnerAnalyticsLoggerTest {
   fun testExpLogger_endCard_noOngoingState_logsConsoleWarning() {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
+    testCoroutineDispatchers.runCurrent()
 
     expLogger.endCard()
+    testCoroutineDispatchers.runCurrent()
 
     val log = ShadowLog.getLogs().getMostRecentWithTag("LearnerAnalyticsLogger")
     assertThat(log.msg).contains("Attempting to end a card not yet started")
@@ -462,8 +513,10 @@ class LearnerAnalyticsLoggerTest {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
     expLogger.startCard(exploration5.getStateByName(exploration5.initStateName))
+    testCoroutineDispatchers.runCurrent()
 
     expLogger.endCard()
+    testCoroutineDispatchers.runCurrent()
 
     assertThat(expLogger.stateAnalyticsLogger.value).isNull()
   }
@@ -473,8 +526,10 @@ class LearnerAnalyticsLoggerTest {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
     expLogger.startCard(exploration5.getStateByName(exploration5.initStateName))
+    testCoroutineDispatchers.runCurrent()
 
     expLogger.endCard()
+    testCoroutineDispatchers.runCurrent()
 
     assertThat(fakeAnalyticsEventLogger.noEventsPresent()).isTrue()
   }
@@ -483,8 +538,10 @@ class LearnerAnalyticsLoggerTest {
   fun testExpLogger_logResumeExploration_outsideCard_logsExpEvent() {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
+    testCoroutineDispatchers.runCurrent()
 
     expLogger.logResumeExploration()
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
@@ -499,8 +556,10 @@ class LearnerAnalyticsLoggerTest {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
     expLogger.startCard(exploration5.getStateByName(exploration5.initStateName))
+    testCoroutineDispatchers.runCurrent()
 
     expLogger.logResumeExploration()
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
@@ -514,8 +573,10 @@ class LearnerAnalyticsLoggerTest {
   fun testExpLogger_logStartExplorationOver_outsideCard_logsExpEvent() {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
+    testCoroutineDispatchers.runCurrent()
 
     expLogger.logStartExplorationOver()
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
@@ -530,8 +591,10 @@ class LearnerAnalyticsLoggerTest {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
     expLogger.startCard(exploration5.getStateByName(exploration5.initStateName))
+    testCoroutineDispatchers.runCurrent()
 
     expLogger.logStartExplorationOver()
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
@@ -545,8 +608,10 @@ class LearnerAnalyticsLoggerTest {
   fun testExpLogger_logExitExploration_outsideCard_logsConsoleWarningAndNoEvents() {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
+    testCoroutineDispatchers.runCurrent()
 
     expLogger.logExitExploration()
+    testCoroutineDispatchers.runCurrent()
 
     val log = ShadowLog.getLogs().getMostRecentWithTag("LearnerAnalyticsLogger")
     assertThat(log.msg).contains("Attempting to log a state event outside state")
@@ -559,8 +624,10 @@ class LearnerAnalyticsLoggerTest {
     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.logExitExploration()
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
@@ -582,8 +649,10 @@ class LearnerAnalyticsLoggerTest {
   fun testExpLogger_logFinishExploration_outsideCard_logsConsoleWarningAndNoEvents() {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
+    testCoroutineDispatchers.runCurrent()
 
     expLogger.logFinishExploration()
+    testCoroutineDispatchers.runCurrent()
 
     val log = ShadowLog.getLogs().getMostRecentWithTag("LearnerAnalyticsLogger")
     assertThat(log.msg).contains("Attempting to log a state event outside state")
@@ -596,8 +665,10 @@ class LearnerAnalyticsLoggerTest {
     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.logFinishExploration()
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
@@ -620,8 +691,10 @@ class LearnerAnalyticsLoggerTest {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
     val stateLogger = expLogger.startCard(exploration5.getStateByName(TEST_EXP_5_STATE_THREE_NAME))
+    testCoroutineDispatchers.runCurrent()
 
     stateLogger.logStartCard()
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
@@ -647,8 +720,10 @@ class LearnerAnalyticsLoggerTest {
     val exploration2 = loadExploration(TEST_EXPLORATION_ID_2)
     val expLogger = learnerAnalyticsLogger.beginExploration(exploration2)
     val stateLogger = expLogger.startCard(exploration2.getStateByName(exploration2.initStateName))
+    testCoroutineDispatchers.runCurrent()
 
     stateLogger.logStartCard()
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
@@ -660,8 +735,10 @@ class LearnerAnalyticsLoggerTest {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
     val stateLogger = expLogger.startCard(exploration5.getStateByName(TEST_EXP_5_STATE_THREE_NAME))
+    testCoroutineDispatchers.runCurrent()
 
     stateLogger.logEndCard()
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
@@ -687,8 +764,10 @@ class LearnerAnalyticsLoggerTest {
     val exploration2 = loadExploration(TEST_EXPLORATION_ID_2)
     val expLogger = learnerAnalyticsLogger.beginExploration(exploration2)
     val stateLogger = expLogger.startCard(exploration2.getStateByName(exploration2.initStateName))
+    testCoroutineDispatchers.runCurrent()
 
     stateLogger.logEndCard()
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
@@ -696,16 +775,18 @@ class LearnerAnalyticsLoggerTest {
   }
 
   @Test
-  fun testStateAnalyticsLogger_logHintOffered_logsStateEventWithHintIndex() {
+  fun testStateAnalyticsLogger_logHintUnlocked_logsStateEventWithHintIndex() {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
     val stateLogger = expLogger.startCard(exploration5.getStateByName(TEST_EXP_5_STATE_THREE_NAME))
+    testCoroutineDispatchers.runCurrent()
 
-    stateLogger.logHintOffered(hintIndex = 1)
+    stateLogger.logHintUnlocked(hintIndex = 1)
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
-    assertThat(eventLog).hasHintOfferedContextThat {
+    assertThat(eventLog).hasHintUnlockedContextThat {
       hasExplorationDetailsThat {
         hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
         hasStoryIdThat().isEqualTo(TEST_STORY_ID)
@@ -723,16 +804,18 @@ class LearnerAnalyticsLoggerTest {
   }
 
   @Test
-  fun testStateAnalyticsLogger_logHintOffered_diffIndex_logsStateEventWithHintIndex() {
+  fun testStateAnalyticsLogger_logHintUnlocked_diffIndex_logsStateEventWithHintIndex() {
     val exploration2 = loadExploration(TEST_EXPLORATION_ID_2)
     val expLogger = learnerAnalyticsLogger.beginExploration(exploration2)
     val stateLogger = expLogger.startCard(exploration2.getStateByName(exploration2.initStateName))
+    testCoroutineDispatchers.runCurrent()
 
-    stateLogger.logHintOffered(hintIndex = 2)
+    stateLogger.logHintUnlocked(hintIndex = 2)
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
-    assertThat(eventLog).hasHintOfferedContextThat().hasHintIndexThat().isEqualTo(2)
+    assertThat(eventLog).hasHintUnlockedContextThat().hasHintIndexThat().isEqualTo(2)
   }
 
   @Test
@@ -740,8 +823,10 @@ class LearnerAnalyticsLoggerTest {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
     val stateLogger = expLogger.startCard(exploration5.getStateByName(TEST_EXP_5_STATE_THREE_NAME))
+    testCoroutineDispatchers.runCurrent()
 
     stateLogger.logViewHint(hintIndex = 1)
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
@@ -767,8 +852,10 @@ class LearnerAnalyticsLoggerTest {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
     val stateLogger = expLogger.startCard(exploration5.getStateByName(TEST_EXP_5_STATE_THREE_NAME))
+    testCoroutineDispatchers.runCurrent()
 
     stateLogger.logViewHint(hintIndex = 2)
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
@@ -776,16 +863,18 @@ class LearnerAnalyticsLoggerTest {
   }
 
   @Test
-  fun testStateAnalyticsLogger_logSolutionOffered_logsStateEvent() {
+  fun testStateAnalyticsLogger_logSolutionUnlocked_logsStateEvent() {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
     val stateLogger = expLogger.startCard(exploration5.getStateByName(TEST_EXP_5_STATE_THREE_NAME))
+    testCoroutineDispatchers.runCurrent()
 
-    stateLogger.logSolutionOffered()
+    stateLogger.logSolutionUnlocked()
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
-    assertThat(eventLog).hasSolutionOfferedContextThat {
+    assertThat(eventLog).hasSolutionUnlockedContextThat {
       hasTopicIdThat().isEqualTo(TEST_TOPIC_ID)
       hasStoryIdThat().isEqualTo(TEST_STORY_ID)
       hasExplorationIdThat().isEqualTo(TEST_EXPLORATION_ID_5)
@@ -804,8 +893,10 @@ class LearnerAnalyticsLoggerTest {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
     val stateLogger = expLogger.startCard(exploration5.getStateByName(TEST_EXP_5_STATE_THREE_NAME))
+    testCoroutineDispatchers.runCurrent()
 
     stateLogger.logViewSolution()
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
@@ -828,12 +919,14 @@ class LearnerAnalyticsLoggerTest {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
     val stateLogger = expLogger.startCard(exploration5.getStateByName(TEST_EXP_5_STATE_THREE_NAME))
+    testCoroutineDispatchers.runCurrent()
 
     stateLogger.logSubmitAnswer(
       interaction = Interaction.getDefaultInstance(),
       userAnswer = UserAnswer.getDefaultInstance(),
       isCorrect = false
     )
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
@@ -859,12 +952,14 @@ class LearnerAnalyticsLoggerTest {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
     val stateLogger = expLogger.startCard(exploration5.getStateByName(TEST_EXP_5_STATE_THREE_NAME))
+    testCoroutineDispatchers.runCurrent()
 
     stateLogger.logSubmitAnswer(
       interaction = Interaction.getDefaultInstance(),
       userAnswer = UserAnswer.getDefaultInstance(),
       isCorrect = true
     )
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
@@ -876,8 +971,10 @@ class LearnerAnalyticsLoggerTest {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
     val stateLogger = expLogger.startCard(exploration5.getStateByName(TEST_EXP_5_STATE_THREE_NAME))
+    testCoroutineDispatchers.runCurrent()
 
     stateLogger.logPlayVoiceOver(contentId = "test_content_id_1", languageCode = "en")
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
@@ -904,8 +1001,10 @@ class LearnerAnalyticsLoggerTest {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
     val stateLogger = expLogger.startCard(exploration5.getStateByName(TEST_EXP_5_STATE_THREE_NAME))
+    testCoroutineDispatchers.runCurrent()
 
     stateLogger.logPlayVoiceOver(contentId = "content_id_2", languageCode = "sw")
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
@@ -918,8 +1017,10 @@ class LearnerAnalyticsLoggerTest {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
     val stateLogger = expLogger.startCard(exploration5.getStateByName(TEST_EXP_5_STATE_THREE_NAME))
+    testCoroutineDispatchers.runCurrent()
 
     stateLogger.logPlayVoiceOver(contentId = null, languageCode = "en")
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
@@ -931,8 +1032,10 @@ class LearnerAnalyticsLoggerTest {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
     val stateLogger = expLogger.startCard(exploration5.getStateByName(TEST_EXP_5_STATE_THREE_NAME))
+    testCoroutineDispatchers.runCurrent()
 
     stateLogger.logPlayVoiceOver(contentId = "content_id_2", languageCode = null)
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
@@ -944,8 +1047,10 @@ class LearnerAnalyticsLoggerTest {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
     val stateLogger = expLogger.startCard(exploration5.getStateByName(TEST_EXP_5_STATE_THREE_NAME))
+    testCoroutineDispatchers.runCurrent()
 
     stateLogger.logPauseVoiceOver(contentId = "test_content_id_1", languageCode = "en")
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
@@ -972,8 +1077,10 @@ class LearnerAnalyticsLoggerTest {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
     val stateLogger = expLogger.startCard(exploration5.getStateByName(TEST_EXP_5_STATE_THREE_NAME))
+    testCoroutineDispatchers.runCurrent()
 
     stateLogger.logPauseVoiceOver(contentId = "content_id_2", languageCode = "sw")
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
@@ -986,8 +1093,10 @@ class LearnerAnalyticsLoggerTest {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
     val stateLogger = expLogger.startCard(exploration5.getStateByName(TEST_EXP_5_STATE_THREE_NAME))
+    testCoroutineDispatchers.runCurrent()
 
     stateLogger.logPauseVoiceOver(contentId = null, languageCode = "en")
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
@@ -999,8 +1108,10 @@ class LearnerAnalyticsLoggerTest {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
     val stateLogger = expLogger.startCard(exploration5.getStateByName(TEST_EXP_5_STATE_THREE_NAME))
+    testCoroutineDispatchers.runCurrent()
 
     stateLogger.logPauseVoiceOver(contentId = "content_id_2", languageCode = null)
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
@@ -1019,8 +1130,10 @@ class LearnerAnalyticsLoggerTest {
       learnerAnalyticsLogger.beginExploration(
         exploration5, learnerId = learnerIdParameter, installationId = installIdParameter
       )
+    testCoroutineDispatchers.runCurrent()
 
     expLogger.logResumeExploration()
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasResumeExplorationContextThat {
@@ -1041,8 +1154,10 @@ class LearnerAnalyticsLoggerTest {
       learnerAnalyticsLogger.beginExploration(
         exploration5, learnerId = learnerIdParameter, installationId = installIdParameter
       )
+    testCoroutineDispatchers.runCurrent()
 
     expLogger.logStartExplorationOver()
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasStartOverExplorationContextThat {
@@ -1062,9 +1177,11 @@ class LearnerAnalyticsLoggerTest {
       learnerAnalyticsLogger.beginExploration(
         exploration5, learnerId = learnerIdParameter, installationId = installIdParameter
       )
+    testCoroutineDispatchers.runCurrent()
     expLogger.startCard(exploration5.getStateByName(exploration5.initStateName))
 
     expLogger.logExitExploration()
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasExitExplorationContextThat {
@@ -1080,9 +1197,11 @@ class LearnerAnalyticsLoggerTest {
     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.logExitExploration()
+    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
@@ -1105,9 +1224,11 @@ class LearnerAnalyticsLoggerTest {
       learnerAnalyticsLogger.beginExploration(
         exploration5, learnerId = learnerIdParameter, installationId = installIdParameter
       )
+    testCoroutineDispatchers.runCurrent()
     expLogger.startCard(exploration5.getStateByName(exploration5.initStateName))
 
     expLogger.logFinishExploration()
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasFinishExplorationContextThat {
@@ -1123,9 +1244,11 @@ class LearnerAnalyticsLoggerTest {
     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.logFinishExploration()
+    testCoroutineDispatchers.runCurrent()
 
     // See testExpLogger_logExitExploration_noInstallOrLearnerIds_logsEventAndConsoleErrors.
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
@@ -1146,9 +1269,11 @@ class LearnerAnalyticsLoggerTest {
       learnerAnalyticsLogger.beginExploration(
         exploration5, learnerId = learnerIdParameter, installationId = installIdParameter
       )
+    testCoroutineDispatchers.runCurrent()
     val stateLogger = expLogger.startCard(exploration5.getStateByName(exploration5.initStateName))
 
     stateLogger.logStartCard()
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasStartCardContextThat {
@@ -1166,9 +1291,11 @@ class LearnerAnalyticsLoggerTest {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger =
       learnerAnalyticsLogger.beginExploration(exploration5, learnerId = null, installationId = null)
+    testCoroutineDispatchers.runCurrent()
     val stateLogger = expLogger.startCard(exploration5.getStateByName(exploration5.initStateName))
 
     stateLogger.logStartCard()
+    testCoroutineDispatchers.runCurrent()
 
     // See testExpLogger_logExitExploration_noInstallOrLearnerIds_logsEventAndConsoleErrors.
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
@@ -1189,9 +1316,11 @@ class LearnerAnalyticsLoggerTest {
       learnerAnalyticsLogger.beginExploration(
         exploration5, learnerId = learnerIdParameter, installationId = installIdParameter
       )
+    testCoroutineDispatchers.runCurrent()
     val stateLogger = expLogger.startCard(exploration5.getStateByName(exploration5.initStateName))
 
     stateLogger.logEndCard()
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasEndCardContextThat {
@@ -1209,9 +1338,11 @@ class LearnerAnalyticsLoggerTest {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger =
       learnerAnalyticsLogger.beginExploration(exploration5, learnerId = null, installationId = null)
+    testCoroutineDispatchers.runCurrent()
     val stateLogger = expLogger.startCard(exploration5.getStateByName(exploration5.initStateName))
 
     stateLogger.logEndCard()
+    testCoroutineDispatchers.runCurrent()
 
     // See testExpLogger_logExitExploration_noInstallOrLearnerIds_logsEventAndConsoleErrors.
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
@@ -1226,18 +1357,20 @@ class LearnerAnalyticsLoggerTest {
     Iteration("no_install_id", "lid=learn", "iid=null", "elid=learn", "eid="),
     Iteration("no_learner_id", "lid=null", "iid=install", "elid=", "eid=install")
   )
-  fun testStateAnalyticsLogger_logHintOffered_missingOneId_logsEventWithMissingId() {
+  fun testStateAnalyticsLogger_logHintUnlocked_missingOneId_logsEventWithMissingId() {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger =
       learnerAnalyticsLogger.beginExploration(
         exploration5, learnerId = learnerIdParameter, installationId = installIdParameter
       )
+    testCoroutineDispatchers.runCurrent()
     val stateLogger = expLogger.startCard(exploration5.getStateByName(exploration5.initStateName))
 
-    stateLogger.logHintOffered(hintIndex = 1)
+    stateLogger.logHintUnlocked(hintIndex = 1)
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
-    assertThat(eventLog).hasHintOfferedContextThat {
+    assertThat(eventLog).hasHintUnlockedContextThat {
       hasExplorationDetailsThat {
         hasLearnerDetailsThat {
           hasLearnerIdThat().isEqualTo(expectedLearnerIdParameter)
@@ -1248,13 +1381,15 @@ class LearnerAnalyticsLoggerTest {
   }
 
   @Test
-  fun testStateAnalyticsLogger_logHintOffered_noInstallOrLearnerIds_logsEventAndConsoleErrors() {
+  fun testStateAnalyticsLogger_logHintUnlocked_noInstallOrLearnerIds_logsEventAndConsoleErrors() {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger =
       learnerAnalyticsLogger.beginExploration(exploration5, learnerId = null, installationId = null)
+    testCoroutineDispatchers.runCurrent()
     val stateLogger = expLogger.startCard(exploration5.getStateByName(exploration5.initStateName))
 
-    stateLogger.logHintOffered(hintIndex = 1)
+    stateLogger.logHintUnlocked(hintIndex = 1)
+    testCoroutineDispatchers.runCurrent()
 
     // See testExpLogger_logExitExploration_noInstallOrLearnerIds_logsEventAndConsoleErrors.
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
@@ -1275,9 +1410,11 @@ class LearnerAnalyticsLoggerTest {
       learnerAnalyticsLogger.beginExploration(
         exploration5, learnerId = learnerIdParameter, installationId = installIdParameter
       )
+    testCoroutineDispatchers.runCurrent()
     val stateLogger = expLogger.startCard(exploration5.getStateByName(exploration5.initStateName))
 
     stateLogger.logViewHint(hintIndex = 1)
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasAccessHintContextThat {
@@ -1295,9 +1432,11 @@ class LearnerAnalyticsLoggerTest {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger =
       learnerAnalyticsLogger.beginExploration(exploration5, learnerId = null, installationId = null)
+    testCoroutineDispatchers.runCurrent()
     val stateLogger = expLogger.startCard(exploration5.getStateByName(exploration5.initStateName))
 
     stateLogger.logViewHint(hintIndex = 1)
+    testCoroutineDispatchers.runCurrent()
 
     // See testExpLogger_logExitExploration_noInstallOrLearnerIds_logsEventAndConsoleErrors.
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
@@ -1312,18 +1451,20 @@ class LearnerAnalyticsLoggerTest {
     Iteration("no_install_id", "lid=learn", "iid=null", "elid=learn", "eid="),
     Iteration("no_learner_id", "lid=null", "iid=install", "elid=", "eid=install")
   )
-  fun testStateAnalyticsLogger_logSolutionOffered_missingOneId_logsEventWithMissingId() {
+  fun testStateAnalyticsLogger_logSolutionUnlocked_missingOneId_logsEventWithMissingId() {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger =
       learnerAnalyticsLogger.beginExploration(
         exploration5, learnerId = learnerIdParameter, installationId = installIdParameter
       )
+    testCoroutineDispatchers.runCurrent()
     val stateLogger = expLogger.startCard(exploration5.getStateByName(exploration5.initStateName))
 
-    stateLogger.logSolutionOffered()
+    stateLogger.logSolutionUnlocked()
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
-    assertThat(eventLog).hasSolutionOfferedContextThat {
+    assertThat(eventLog).hasSolutionUnlockedContextThat {
       hasLearnerDetailsThat {
         hasLearnerIdThat().isEqualTo(expectedLearnerIdParameter)
         hasInstallationIdThat().isEqualTo(expectedInstallIdParameter)
@@ -1332,13 +1473,15 @@ class LearnerAnalyticsLoggerTest {
   }
 
   @Test
-  fun testStateAnalyticsLogger_logSolutionOffered_noInstallOrLearnerIds_logsEvtAndConsoleErrors() {
+  fun testStateAnalyticsLogger_logSolutionUnlocked_noInstallOrLearnerIds_logsEvtAndConsoleErrors() {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger =
       learnerAnalyticsLogger.beginExploration(exploration5, learnerId = null, installationId = null)
+    testCoroutineDispatchers.runCurrent()
     val stateLogger = expLogger.startCard(exploration5.getStateByName(exploration5.initStateName))
 
-    stateLogger.logSolutionOffered()
+    stateLogger.logSolutionUnlocked()
+    testCoroutineDispatchers.runCurrent()
 
     // See testExpLogger_logExitExploration_noInstallOrLearnerIds_logsEventAndConsoleErrors.
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
@@ -1359,9 +1502,11 @@ class LearnerAnalyticsLoggerTest {
       learnerAnalyticsLogger.beginExploration(
         exploration5, learnerId = learnerIdParameter, installationId = installIdParameter
       )
+    testCoroutineDispatchers.runCurrent()
     val stateLogger = expLogger.startCard(exploration5.getStateByName(exploration5.initStateName))
 
     stateLogger.logViewSolution()
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasAccessSolutionContextThat {
@@ -1377,9 +1522,11 @@ class LearnerAnalyticsLoggerTest {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger =
       learnerAnalyticsLogger.beginExploration(exploration5, learnerId = null, installationId = null)
+    testCoroutineDispatchers.runCurrent()
     val stateLogger = expLogger.startCard(exploration5.getStateByName(exploration5.initStateName))
 
     stateLogger.logViewSolution()
+    testCoroutineDispatchers.runCurrent()
 
     // See testExpLogger_logExitExploration_noInstallOrLearnerIds_logsEventAndConsoleErrors.
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
@@ -1400,6 +1547,7 @@ class LearnerAnalyticsLoggerTest {
       learnerAnalyticsLogger.beginExploration(
         exploration5, learnerId = learnerIdParameter, installationId = installIdParameter
       )
+    testCoroutineDispatchers.runCurrent()
     val stateLogger = expLogger.startCard(exploration5.getStateByName(exploration5.initStateName))
 
     stateLogger.logSubmitAnswer(
@@ -1407,6 +1555,7 @@ class LearnerAnalyticsLoggerTest {
       userAnswer = UserAnswer.getDefaultInstance(),
       isCorrect = true
     )
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasSubmitAnswerContextThat {
@@ -1424,6 +1573,7 @@ class LearnerAnalyticsLoggerTest {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger =
       learnerAnalyticsLogger.beginExploration(exploration5, learnerId = null, installationId = null)
+    testCoroutineDispatchers.runCurrent()
     val stateLogger = expLogger.startCard(exploration5.getStateByName(exploration5.initStateName))
 
     stateLogger.logSubmitAnswer(
@@ -1431,6 +1581,7 @@ class LearnerAnalyticsLoggerTest {
       userAnswer = UserAnswer.getDefaultInstance(),
       isCorrect = true
     )
+    testCoroutineDispatchers.runCurrent()
 
     // See testExpLogger_logExitExploration_noInstallOrLearnerIds_logsEventAndConsoleErrors.
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
@@ -1451,9 +1602,11 @@ class LearnerAnalyticsLoggerTest {
       learnerAnalyticsLogger.beginExploration(
         exploration5, learnerId = learnerIdParameter, installationId = installIdParameter
       )
+    testCoroutineDispatchers.runCurrent()
     val stateLogger = expLogger.startCard(exploration5.getStateByName(exploration5.initStateName))
 
     stateLogger.logPlayVoiceOver(contentId = "test_content_id_1", languageCode = "en")
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasPlayVoiceOverContextThat {
@@ -1471,9 +1624,11 @@ class LearnerAnalyticsLoggerTest {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger =
       learnerAnalyticsLogger.beginExploration(exploration5, learnerId = null, installationId = null)
+    testCoroutineDispatchers.runCurrent()
     val stateLogger = expLogger.startCard(exploration5.getStateByName(exploration5.initStateName))
 
     stateLogger.logPlayVoiceOver(contentId = "test_content_id_1", languageCode = "en")
+    testCoroutineDispatchers.runCurrent()
 
     // See testExpLogger_logExitExploration_noInstallOrLearnerIds_logsEventAndConsoleErrors.
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
@@ -1494,9 +1649,11 @@ class LearnerAnalyticsLoggerTest {
       learnerAnalyticsLogger.beginExploration(
         exploration5, learnerId = learnerIdParameter, installationId = installIdParameter
       )
+    testCoroutineDispatchers.runCurrent()
     val stateLogger = expLogger.startCard(exploration5.getStateByName(exploration5.initStateName))
 
     stateLogger.logPauseVoiceOver(contentId = "test_content_id_1", languageCode = "en")
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).hasPauseVoiceOverContextThat {
@@ -1514,9 +1671,11 @@ class LearnerAnalyticsLoggerTest {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger =
       learnerAnalyticsLogger.beginExploration(exploration5, learnerId = null, installationId = null)
+    testCoroutineDispatchers.runCurrent()
     val stateLogger = expLogger.startCard(exploration5.getStateByName(exploration5.initStateName))
 
     stateLogger.logPauseVoiceOver(contentId = "test_content_id_1", languageCode = "en")
+    testCoroutineDispatchers.runCurrent()
 
     // See testExpLogger_logExitExploration_noInstallOrLearnerIds_logsEventAndConsoleErrors.
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
@@ -1530,9 +1689,11 @@ class LearnerAnalyticsLoggerTest {
   fun testStateAnalyticsLogger_logReachInvestedEngagement_logsStateEventWithStateName() {
     val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
     val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
+    testCoroutineDispatchers.runCurrent()
     val stateLogger = expLogger.startCard(exploration5.getStateByName(TEST_EXP_5_STATE_THREE_NAME))
 
     stateLogger.logInvestedEngagement()
+    testCoroutineDispatchers.runCurrent()
 
     val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
     assertThat(eventLog).isEssentialPriority()
@@ -1550,6 +1711,70 @@ class LearnerAnalyticsLoggerTest {
     }
   }
 
+  @Test
+  fun testStateAnalyticsLogger_logSwitchInLessonLanguage_englishToSwahili_logsSwitchLangEvent() {
+    val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
+    val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
+    testCoroutineDispatchers.runCurrent()
+    val stateLogger = expLogger.startCard(exploration5.getStateByName(TEST_EXP_5_STATE_THREE_NAME))
+
+    stateLogger.logSwitchInLessonLanguage(
+      fromLanguage = OppiaLanguage.ENGLISH, toLanguage = OppiaLanguage.SWAHILI
+    )
+    testCoroutineDispatchers.runCurrent()
+
+    val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
+    assertThat(eventLog).isEssentialPriority()
+    assertThat(eventLog).hasSwitchInLessonLanguageContextThat {
+      hasExplorationDetailsThat {
+        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)
+        }
+      }
+      hasSwitchFromLanguageThat().isEqualTo(OppiaLanguage.ENGLISH)
+      hasSwitchToLanguageThat().isEqualTo(OppiaLanguage.SWAHILI)
+    }
+  }
+
+  @Test
+  fun testStateAnalyticsLogger_logSwitchInLessonLanguage_swahiliToEnglish_logsSwitchLangEvent() {
+    val exploration5 = loadExploration(TEST_EXPLORATION_ID_5)
+    val expLogger = learnerAnalyticsLogger.beginExploration(exploration5)
+    testCoroutineDispatchers.runCurrent()
+    val stateLogger = expLogger.startCard(exploration5.getStateByName(TEST_EXP_5_STATE_THREE_NAME))
+
+    stateLogger.logSwitchInLessonLanguage(
+      fromLanguage = OppiaLanguage.SWAHILI, toLanguage = OppiaLanguage.ENGLISH
+    )
+    testCoroutineDispatchers.runCurrent()
+
+    val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
+    assertThat(eventLog).isEssentialPriority()
+    assertThat(eventLog).hasSwitchInLessonLanguageContextThat {
+      hasExplorationDetailsThat {
+        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)
+        }
+      }
+      hasSwitchFromLanguageThat().isEqualTo(OppiaLanguage.SWAHILI)
+      hasSwitchToLanguageThat().isEqualTo(OppiaLanguage.ENGLISH)
+    }
+  }
+
   private fun loadExploration(expId: String): Exploration {
     return monitorFactory.waitForNextSuccessfulResult(
       explorationDataController.getExplorationById(profileId, expId)
@@ -1561,10 +1786,11 @@ class LearnerAnalyticsLoggerTest {
   private fun LearnerAnalyticsLogger.beginExploration(
     exploration: Exploration,
     installationId: String? = TEST_INSTALL_ID,
+    profileId: ProfileId = this@LearnerAnalyticsLoggerTest.profileId,
     learnerId: String? = TEST_LEARNER_ID,
     topicId: String = TEST_TOPIC_ID,
     storyId: String = TEST_STORY_ID
-  ) = beginExploration(installationId, learnerId, exploration, topicId, storyId)
+  ) = beginExploration(installationId, profileId, learnerId, exploration, topicId, storyId)
 
   private fun List<ShadowLog.LogItem>.getMostRecentWithTag(tag: String) = last { it.tag == tag }
 
diff --git a/domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/LogUploadWorkerTest.kt b/domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/LogUploadWorkerTest.kt
index 0b446dfd53c..e3ea58cd2ef 100644
--- a/domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/LogUploadWorkerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/LogUploadWorkerTest.kt
@@ -141,9 +141,11 @@ class LogUploadWorkerTest {
   fun testWorker_logEvent_withoutNetwork_enqueueRequest_verifySuccess() {
     networkConnectionUtil.setCurrentConnectionStatus(NONE)
     analyticsController.logImportantEvent(
-      eventLogTopicContext.timestamp,
-      oppiaLogger.createOpenInfoTabContext(TEST_TOPIC_ID)
+      oppiaLogger.createOpenInfoTabContext(TEST_TOPIC_ID),
+      profileId = null,
+      eventLogTopicContext.timestamp
     )
+    testCoroutineDispatchers.runCurrent()
 
     val workManager = WorkManager.getInstance(ApplicationProvider.getApplicationContext())
 
@@ -168,9 +170,11 @@ class LogUploadWorkerTest {
   fun testWorker_logEvent_withoutNetwork_enqueueRequest_writeFails_verifyFailure() {
     networkConnectionUtil.setCurrentConnectionStatus(NONE)
     analyticsController.logImportantEvent(
-      eventLogTopicContext.timestamp,
-      oppiaLogger.createOpenInfoTabContext(TEST_TOPIC_ID)
+      oppiaLogger.createOpenInfoTabContext(TEST_TOPIC_ID),
+      profileId = null,
+      eventLogTopicContext.timestamp
     )
+    testCoroutineDispatchers.runCurrent()
 
     val workManager = WorkManager.getInstance(ApplicationProvider.getApplicationContext())
 
@@ -196,6 +200,7 @@ class LogUploadWorkerTest {
   fun testWorker_logException_withoutNetwork_enqueueRequest_verifySuccess() {
     networkConnectionUtil.setCurrentConnectionStatus(NONE)
     exceptionsController.logNonFatalException(exception, TEST_TIMESTAMP)
+    testCoroutineDispatchers.runCurrent()
 
     val workManager = WorkManager.getInstance(ApplicationProvider.getApplicationContext())
 
@@ -231,6 +236,7 @@ class LogUploadWorkerTest {
       apkSizeTestLoggableMetric,
       OppiaMetricLog.Priority.LOW_PRIORITY
     )
+    testCoroutineDispatchers.runCurrent()
 
     val workManager = WorkManager.getInstance(ApplicationProvider.getApplicationContext())
 
@@ -266,9 +272,11 @@ class LogUploadWorkerTest {
   fun testWorker_logEvent_withoutNetwork_enqueueRequest_verifyCorrectSyncStatusSequence() {
     networkConnectionUtil.setCurrentConnectionStatus(NONE)
     analyticsController.logImportantEvent(
-      eventLogTopicContext.timestamp,
-      oppiaLogger.createOpenInfoTabContext(TEST_TOPIC_ID)
+      oppiaLogger.createOpenInfoTabContext(TEST_TOPIC_ID),
+      profileId = null,
+      eventLogTopicContext.timestamp
     )
+    testCoroutineDispatchers.runCurrent()
 
     val workManager = WorkManager.getInstance(ApplicationProvider.getApplicationContext())
 
@@ -292,9 +300,11 @@ class LogUploadWorkerTest {
   fun testWorker_logEvent_withoutNetwork_enqueueRequest_writeFails_verifySyncStatusIsFailed() {
     networkConnectionUtil.setCurrentConnectionStatus(NONE)
     analyticsController.logImportantEvent(
-      eventLogTopicContext.timestamp,
-      oppiaLogger.createOpenInfoTabContext(TEST_TOPIC_ID)
+      oppiaLogger.createOpenInfoTabContext(TEST_TOPIC_ID),
+      profileId = null,
+      eventLogTopicContext.timestamp
     )
+    testCoroutineDispatchers.runCurrent()
 
     val workManager = WorkManager.getInstance(ApplicationProvider.getApplicationContext())
 
diff --git a/domain/src/test/java/org/oppia/android/domain/profile/ProfileManagementControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/profile/ProfileManagementControllerTest.kt
index 761c747e124..96f04eb526b 100644
--- a/domain/src/test/java/org/oppia/android/domain/profile/ProfileManagementControllerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/profile/ProfileManagementControllerTest.kt
@@ -29,6 +29,7 @@ import org.oppia.android.app.model.ProfileId
 import org.oppia.android.app.model.ReadingTextSize.MEDIUM_TEXT_SIZE
 import org.oppia.android.domain.oppialogger.ApplicationIdSeed
 import org.oppia.android.domain.oppialogger.LogStorageModule
+import org.oppia.android.domain.oppialogger.LoggingIdentifierController
 import org.oppia.android.domain.oppialogger.analytics.ApplicationLifecycleModule
 import org.oppia.android.testing.FakeAnalyticsEventLogger
 import org.oppia.android.testing.TestLogReportingModule
@@ -39,6 +40,7 @@ import org.oppia.android.testing.robolectric.RobolectricModule
 import org.oppia.android.testing.threading.TestCoroutineDispatchers
 import org.oppia.android.testing.threading.TestDispatcherModule
 import org.oppia.android.testing.time.FakeOppiaClockModule
+import org.oppia.android.util.caching.AssetModule
 import org.oppia.android.util.data.AsyncResult
 import org.oppia.android.util.data.DataProvider
 import org.oppia.android.util.data.DataProvidersInjector
@@ -64,7 +66,8 @@ import javax.inject.Singleton
 
 /** Tests for [ProfileManagementControllerTest]. */
 // FunctionName: test names are conventionally named with underscores.
-@Suppress("FunctionName")
+// SameParameterValue: tests should have specific context included/excluded for readability.
+@Suppress("FunctionName", "SameParameterValue")
 @RunWith(AndroidJUnit4::class)
 @LooperMode(LooperMode.Mode.PAUSED)
 @Config(application = ProfileManagementControllerTest.TestApplication::class)
@@ -77,6 +80,7 @@ class ProfileManagementControllerTest {
   @Inject lateinit var machineLocale: OppiaLocale.MachineLocale
   @field:[BackgroundDispatcher Inject] lateinit var backgroundDispatcher: CoroutineDispatcher
   @Inject lateinit var fakeAnalyticsEventLogger: FakeAnalyticsEventLogger
+  @Inject lateinit var loggingIdentifierController: LoggingIdentifierController
 
   private companion object {
     private val PROFILES_LIST = listOf<Profile>(
@@ -88,6 +92,7 @@ class ProfileManagementControllerTest {
     )
 
     private val ADMIN_PROFILE_ID_0 = ProfileId.newBuilder().setInternalId(0).build()
+    private val PROFILE_ID_0 = ProfileId.newBuilder().setInternalId(0).build()
     private val PROFILE_ID_1 = ProfileId.newBuilder().setInternalId(1).build()
     private val PROFILE_ID_2 = ProfileId.newBuilder().setInternalId(2).build()
     private val PROFILE_ID_3 = ProfileId.newBuilder().setInternalId(3).build()
@@ -96,6 +101,7 @@ class ProfileManagementControllerTest {
 
     private const val DEFAULT_PIN = "12345"
     private const val DEFAULT_ALLOW_DOWNLOAD_ACCESS = true
+    private const val DEFAULT_ALLOW_IN_LESSON_QUICK_LANGUAGE_SWITCHING = false
     private const val DEFAULT_AVATAR_COLOR_RGB = -10710042
   }
 
@@ -250,6 +256,48 @@ class ProfileManagementControllerTest {
     assertThat(profile.learnerId).isEqualTo("68fb0e6f")
   }
 
+  @Test
+  fun testGetCurrentProfileId_noProfileLoggedIn_returnsNull() {
+    setUpTestApplicationComponentWithLearnerAnalyticsStudy()
+    addTestProfiles()
+
+    val currentProfileId = profileManagementController.getCurrentProfileId()
+
+    // If no profile is logged in, then no current ID can be reported.
+    assertThat(currentProfileId).isNull()
+  }
+
+  @Test
+  fun testGetCurrentProfileId_withProfileLoggedIn_returnsLoggedInProfileId() {
+    setUpTestApplicationComponentWithLearnerAnalyticsStudy()
+    addTestProfiles()
+    monitorFactory.ensureDataProviderExecutes(
+      profileManagementController.loginToProfile(PROFILE_ID_1)
+    )
+
+    val currentProfileId = profileManagementController.getCurrentProfileId()
+
+    // The reported current profile ID should be the one that was logged into most recently.
+    assertThat(currentProfileId).isEqualTo(PROFILE_ID_1)
+  }
+
+  @Test
+  fun testGetCurrentProfileId_withProfileLoggedIn_thenAnother_returnsLatestLoggedInProfileId() {
+    setUpTestApplicationComponentWithLearnerAnalyticsStudy()
+    addTestProfiles()
+    monitorFactory.ensureDataProviderExecutes(
+      profileManagementController.loginToProfile(PROFILE_ID_1)
+    )
+    monitorFactory.ensureDataProviderExecutes(
+      profileManagementController.loginToProfile(PROFILE_ID_2)
+    )
+
+    val currentProfileId = profileManagementController.getCurrentProfileId()
+
+    // The reported current profile ID should be the one that was logged into most recently.
+    assertThat(currentProfileId).isEqualTo(PROFILE_ID_2)
+  }
+
   @Test
   fun testFetchCurrentLearnerId_noLoggedInProfile_returnsNull() {
     setUpTestApplicationComponent()
@@ -521,6 +569,133 @@ class ProfileManagementControllerTest {
     assertThat(error).hasMessageThat().contains("ProfileId 6 does not match an existing Profile")
   }
 
+  @Test
+  fun testUpdateEnableInLessonLangSwitching_badProfileId_updateFails() {
+    setUpTestApplicationComponent()
+    addTestProfiles()
+
+    val updateProvider = profileManagementController.updateEnableInLessonQuickLanguageSwitching(
+      profileId = PROFILE_ID_6, allowInLessonQuickLanguageSwitching = true
+    )
+
+    val error = monitorFactory.waitForNextFailureResult(updateProvider)
+    assertThat(error).hasMessageThat().contains("ProfileId 6 does not match an existing Profile")
+  }
+
+  @Test
+  fun testUpdateEnableInLessonLangSwitching_noPerm_enablePermission_updateSucceeds() {
+    setUpTestApplicationComponent()
+    addProfileForLanguageSwitching(allowInLessonQuickLanguageSwitching = false)
+
+    val updateProvider = profileManagementController.updateEnableInLessonQuickLanguageSwitching(
+      profileId = PROFILE_ID_0, allowInLessonQuickLanguageSwitching = true
+    )
+    val monitor = monitorFactory.createMonitor(updateProvider)
+    testCoroutineDispatchers.runCurrent()
+
+    monitor.ensureNextResultIsSuccess()
+  }
+
+  @Test
+  fun testUpdateEnableInLessonLangSwitching_noPerm_enablePermission_profileCanNowSwitchLangs() {
+    setUpTestApplicationComponent()
+    addProfileForLanguageSwitching(allowInLessonQuickLanguageSwitching = false)
+
+    val updateProvider = profileManagementController.updateEnableInLessonQuickLanguageSwitching(
+      profileId = PROFILE_ID_0, allowInLessonQuickLanguageSwitching = true
+    )
+    monitorFactory.ensureDataProviderExecutes(updateProvider)
+
+    // The permission has been enabled.
+    val profile = retrieveProfile(PROFILE_ID_0)
+    assertThat(profile.allowInLessonQuickLanguageSwitching).isTrue()
+  }
+
+  @Test
+  fun testUpdateEnableInLessonLangSwitching_noPerm_disablePermission_updateSucceeds() {
+    setUpTestApplicationComponent()
+    addProfileForLanguageSwitching(allowInLessonQuickLanguageSwitching = false)
+
+    val updateProvider = profileManagementController.updateEnableInLessonQuickLanguageSwitching(
+      profileId = PROFILE_ID_0, allowInLessonQuickLanguageSwitching = false
+    )
+    val monitor = monitorFactory.createMonitor(updateProvider)
+    testCoroutineDispatchers.runCurrent()
+
+    monitor.ensureNextResultIsSuccess()
+  }
+
+  @Test
+  fun testUpdateEnableInLessonLangSwitching_noPerm_disablePermission_profileCannotSwitchLangs() {
+    setUpTestApplicationComponent()
+    addProfileForLanguageSwitching(allowInLessonQuickLanguageSwitching = false)
+
+    val updateProvider = profileManagementController.updateEnableInLessonQuickLanguageSwitching(
+      profileId = PROFILE_ID_0, allowInLessonQuickLanguageSwitching = false
+    )
+    monitorFactory.ensureDataProviderExecutes(updateProvider)
+
+    val profile = retrieveProfile(PROFILE_ID_0)
+    assertThat(profile.allowInLessonQuickLanguageSwitching).isFalse()
+  }
+
+  @Test
+  fun testUpdateEnableInLessonLangSwitching_withPerm_enablePermission_updateSucceeds() {
+    setUpTestApplicationComponent()
+    addProfileForLanguageSwitching(allowInLessonQuickLanguageSwitching = true)
+
+    val updateProvider = profileManagementController.updateEnableInLessonQuickLanguageSwitching(
+      profileId = PROFILE_ID_0, allowInLessonQuickLanguageSwitching = true
+    )
+    val monitor = monitorFactory.createMonitor(updateProvider)
+    testCoroutineDispatchers.runCurrent()
+
+    monitor.ensureNextResultIsSuccess()
+  }
+
+  @Test
+  fun testUpdateEnableInLessonLangSwitching_withPerm_enablePermission_profileCanSwitchLangs() {
+    setUpTestApplicationComponent()
+    addProfileForLanguageSwitching(allowInLessonQuickLanguageSwitching = true)
+
+    val updateProvider = profileManagementController.updateEnableInLessonQuickLanguageSwitching(
+      profileId = PROFILE_ID_0, allowInLessonQuickLanguageSwitching = true
+    )
+    monitorFactory.ensureDataProviderExecutes(updateProvider)
+
+    val profile = retrieveProfile(PROFILE_ID_0)
+    assertThat(profile.allowInLessonQuickLanguageSwitching).isTrue()
+  }
+
+  @Test
+  fun testUpdateEnableInLessonLangSwitching_withPerm_disablePermission_updateSucceeds() {
+    setUpTestApplicationComponent()
+    addProfileForLanguageSwitching(allowInLessonQuickLanguageSwitching = true)
+
+    val updateProvider = profileManagementController.updateEnableInLessonQuickLanguageSwitching(
+      profileId = PROFILE_ID_0, allowInLessonQuickLanguageSwitching = false
+    )
+    val monitor = monitorFactory.createMonitor(updateProvider)
+    testCoroutineDispatchers.runCurrent()
+
+    monitor.ensureNextResultIsSuccess()
+  }
+
+  @Test
+  fun testUpdateEnableInLessonLangSwitching_withPerm_disablePerm_profileCannotNowSwitchLangs() {
+    setUpTestApplicationComponent()
+    addProfileForLanguageSwitching(allowInLessonQuickLanguageSwitching = true)
+
+    val updateProvider = profileManagementController.updateEnableInLessonQuickLanguageSwitching(
+      profileId = PROFILE_ID_0, allowInLessonQuickLanguageSwitching = false
+    )
+    monitorFactory.ensureDataProviderExecutes(updateProvider)
+
+    // The permission has been disabled.
+    val profile = retrieveProfile(PROFILE_ID_0)
+    assertThat(profile.allowInLessonQuickLanguageSwitching).isFalse()
+  }
+
   @Test
   fun testUpdateReadingTextSize_addProfiles_updateWithFontSize18_checkUpdateIsSuccessful() {
     setUpTestApplicationComponent()
@@ -628,7 +803,7 @@ class ProfileManagementControllerTest {
     val profileProvider = profileManagementController.getProfile(PROFILE_ID_2)
     monitorFactory.waitForNextSuccessfulResult(loginProvider)
     val profile = monitorFactory.waitForNextSuccessfulResult(profileProvider)
-    assertThat(profileManagementController.getCurrentProfileId().internalId).isEqualTo(2)
+    assertThat(profileManagementController.getCurrentProfileId()?.internalId).isEqualTo(2)
     assertThat(profile.lastLoggedInTimestampMs).isNotEqualTo(0)
     assertThat(profile.numberOfLogins).isEqualTo(1)
   }
@@ -667,6 +842,73 @@ class ProfileManagementControllerTest {
       )
   }
 
+  @Test
+  fun testLogInToProfile_sessionIdHasChanged() {
+    setUpTestApplicationComponent()
+    addTestProfiles()
+    val previousSessionId = retrieveCurrentSessionId()
+
+    monitorFactory.ensureDataProviderExecutes(
+      profileManagementController.loginToProfile(PROFILE_ID_1)
+    )
+
+    // Logging into a new profile should regenerate the session ID.
+    val latestSessionId = retrieveCurrentSessionId()
+    assertThat(latestSessionId).isNotEqualTo(previousSessionId)
+  }
+
+  @Test
+  fun testLogInToProfile_thenToSameProfileAgain_sessionIdHasChangedAgain() {
+    setUpTestApplicationComponent()
+    addTestProfiles()
+    monitorFactory.ensureDataProviderExecutes(
+      profileManagementController.loginToProfile(PROFILE_ID_1)
+    )
+    val previousSessionId = retrieveCurrentSessionId()
+
+    // Log into the same profile twice (e.g. the case where the user logs out, then back in).
+    monitorFactory.ensureDataProviderExecutes(
+      profileManagementController.loginToProfile(PROFILE_ID_1)
+    )
+
+    // Logging into the same profile a second time should also regenerate the session ID.
+    val latestSessionId = retrieveCurrentSessionId()
+    assertThat(latestSessionId).isNotEqualTo(previousSessionId)
+  }
+
+  @Test
+  fun testLogInToProfile_thenToAnotherProfile_sessionIdHasChangedAgain() {
+    setUpTestApplicationComponent()
+    addTestProfiles()
+    monitorFactory.ensureDataProviderExecutes(
+      profileManagementController.loginToProfile(PROFILE_ID_1)
+    )
+    val sessionIdForProfile1 = retrieveCurrentSessionId()
+
+    monitorFactory.ensureDataProviderExecutes(
+      profileManagementController.loginToProfile(PROFILE_ID_2)
+    )
+
+    // Logging into a different profile a should regenerate the session ID.
+    val sessionIdForProfile2 = retrieveCurrentSessionId()
+    assertThat(sessionIdForProfile2).isNotEqualTo(sessionIdForProfile1)
+  }
+
+  @Test
+  fun testLogInToProfile_invalidProfile_sessionIdDoesNotChange() {
+    setUpTestApplicationComponent()
+    addTestProfiles()
+    val previousSessionId = retrieveCurrentSessionId()
+
+    monitorFactory.ensureDataProviderExecutes(
+      profileManagementController.loginToProfile(PROFILE_ID_6)
+    )
+
+    // The session ID shouldn't change if the attempt to log in failed.
+    val latestSessionId = retrieveCurrentSessionId()
+    assertThat(latestSessionId).isEqualTo(previousSessionId)
+  }
+
   @Test
   fun testWasProfileEverAdded_addAdminProfile_checkIfProfileEverAdded() {
     setUpTestApplicationComponent()
@@ -883,6 +1125,19 @@ class ProfileManagementControllerTest {
     }
   }
 
+  private fun addProfileForLanguageSwitching(allowInLessonQuickLanguageSwitching: Boolean) {
+    addNonAdminProfileAndWait(
+      name = "Test Profile",
+      allowInLessonQuickLanguageSwitching = allowInLessonQuickLanguageSwitching
+    )
+  }
+
+  private fun retrieveProfile(profileId: ProfileId) =
+    monitorFactory.waitForNextSuccessfulResult(profileManagementController.getProfile(profileId))
+
+  private fun retrieveCurrentSessionId() =
+    monitorFactory.waitForNextSuccessfulResult(loggingIdentifierController.getSessionId())
+
   private fun getAbsoluteDirPath(path: String): String {
     /**
      * context.filesDir.toString() looks like /tmp/robolectric-Method_test_name/org.oppia.android.util.test-dataDir/files
@@ -908,10 +1163,17 @@ class ProfileManagementControllerTest {
     name: String,
     pin: String = DEFAULT_PIN,
     allowDownloadAccess: Boolean = DEFAULT_ALLOW_DOWNLOAD_ACCESS,
+    allowInLessonQuickLanguageSwitching: Boolean = DEFAULT_ALLOW_IN_LESSON_QUICK_LANGUAGE_SWITCHING,
     colorRgb: Int = DEFAULT_AVATAR_COLOR_RGB
   ): DataProvider<Any?> {
     return addProfile(
-      name, pin, avatarImagePath = null, allowDownloadAccess, colorRgb, isAdmin = false
+      name,
+      pin,
+      avatarImagePath = null,
+      allowDownloadAccess,
+      allowInLessonQuickLanguageSwitching,
+      colorRgb,
+      isAdmin = false
     )
   }
 
@@ -919,10 +1181,13 @@ class ProfileManagementControllerTest {
     name: String,
     pin: String = DEFAULT_PIN,
     allowDownloadAccess: Boolean = DEFAULT_ALLOW_DOWNLOAD_ACCESS,
+    allowInLessonQuickLanguageSwitching: Boolean = DEFAULT_ALLOW_IN_LESSON_QUICK_LANGUAGE_SWITCHING,
     colorRgb: Int = DEFAULT_AVATAR_COLOR_RGB
   ) {
     monitorFactory.ensureDataProviderExecutes(
-      addNonAdminProfile(name, pin, allowDownloadAccess, colorRgb)
+      addNonAdminProfile(
+        name, pin, allowDownloadAccess, allowInLessonQuickLanguageSwitching, colorRgb
+      )
     )
   }
 
@@ -931,11 +1196,18 @@ class ProfileManagementControllerTest {
     pin: String = DEFAULT_PIN,
     avatarImagePath: Uri? = null,
     allowDownloadAccess: Boolean = DEFAULT_ALLOW_DOWNLOAD_ACCESS,
+    allowInLessonQuickLanguageSwitching: Boolean = DEFAULT_ALLOW_IN_LESSON_QUICK_LANGUAGE_SWITCHING,
     colorRgb: Int = DEFAULT_AVATAR_COLOR_RGB,
     isAdmin: Boolean
   ): DataProvider<Any?> {
     return profileManagementController.addProfile(
-      name, pin, avatarImagePath, allowDownloadAccess, colorRgb, isAdmin
+      name,
+      pin,
+      avatarImagePath,
+      allowDownloadAccess,
+      colorRgb,
+      isAdmin,
+      allowInLessonQuickLanguageSwitching = allowInLessonQuickLanguageSwitching
     )
   }
 
@@ -1048,7 +1320,8 @@ class ProfileManagementControllerTest {
       TestModule::class, TestLogReportingModule::class, LogStorageModule::class,
       TestDispatcherModule::class, RobolectricModule::class, FakeOppiaClockModule::class,
       NetworkConnectionUtilDebugModule::class, LocaleProdModule::class,
-      TestLoggingIdentifierModule::class, SyncStatusModule::class, ApplicationLifecycleModule::class
+      TestLoggingIdentifierModule::class, SyncStatusModule::class, AssetModule::class,
+      ApplicationLifecycleModule::class
     ]
   )
   interface TestApplicationComponent : DataProvidersInjector {
diff --git a/domain/src/test/java/org/oppia/android/domain/translation/TranslationControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/translation/TranslationControllerTest.kt
index f1235167750..783a5e55d17 100644
--- a/domain/src/test/java/org/oppia/android/domain/translation/TranslationControllerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/translation/TranslationControllerTest.kt
@@ -15,6 +15,7 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.oppia.android.app.model.AppLanguageSelection
+import org.oppia.android.app.model.AppLanguageSelection.SelectionTypeCase.USE_SYSTEM_LANGUAGE_OR_APP_DEFAULT
 import org.oppia.android.app.model.AudioTranslationLanguageSelection
 import org.oppia.android.app.model.HtmlTranslationList
 import org.oppia.android.app.model.LanguageSupportDefinition.LanguageId.LanguageTypeCase.IETF_BCP47_ID
@@ -64,6 +65,11 @@ import org.robolectric.annotation.LooperMode
 import java.util.Locale
 import javax.inject.Inject
 import javax.inject.Singleton
+import org.oppia.android.app.model.AppLanguageSelection.SelectionTypeCase.SELECTED_LANGUAGE as SELECTED_APP_LANGUAGE
+import org.oppia.android.app.model.AudioTranslationLanguageSelection.SelectionTypeCase.SELECTED_LANGUAGE as SELECTED_AUDIO_LANGUAGE
+import org.oppia.android.app.model.AudioTranslationLanguageSelection.SelectionTypeCase.USE_APP_LANGUAGE as USE_APP_AUDIO_LANGUAGE
+import org.oppia.android.app.model.WrittenTranslationLanguageSelection.SelectionTypeCase.SELECTED_LANGUAGE as SELECTED_WRITTEN_LANGUAGE
+import org.oppia.android.app.model.WrittenTranslationLanguageSelection.SelectionTypeCase.USE_APP_LANGUAGE as USE_APP_WRITTEN_LANGUAGE
 
 /** Tests for [TranslationController]. */
 // FunctionName: test names are conventionally named with underscores.
@@ -342,6 +348,139 @@ class TranslationControllerTest {
     assertThat(context.languageDefinition.language).isEqualTo(ENGLISH)
   }
 
+  @Test
+  fun testGetAppLanguageSelection_uninitialized_returnsDefaultSelection() {
+    forceDefaultLocale(Locale.ROOT)
+
+    val selectionProvider = translationController.getAppLanguageSelection(PROFILE_ID_0)
+
+    val selection = monitorFactory.waitForNextSuccessfulResult(selectionProvider)
+    assertThat(selection).isEqualToDefaultInstance()
+  }
+
+  @Test
+  fun testGetAppLanguageSelection_updateLanguageToEnglish_returnsEnglishSelection() {
+    forceDefaultLocale(Locale.ROOT)
+    ensureAppLanguageIsUpdatedTo(PROFILE_ID_0, ENGLISH)
+
+    val selectionProvider = translationController.getAppLanguageSelection(PROFILE_ID_0)
+
+    val selection = monitorFactory.waitForNextSuccessfulResult(selectionProvider)
+    assertThat(selection.selectionTypeCase).isEqualTo(SELECTED_APP_LANGUAGE)
+    assertThat(selection.selectedLanguage).isEqualTo(ENGLISH)
+  }
+
+  @Test
+  fun testGetAppLanguageSelection_updateLanguageToPortuguese_returnsPortugueseSelection() {
+    forceDefaultLocale(Locale.ROOT)
+    ensureAppLanguageIsUpdatedTo(PROFILE_ID_0, BRAZILIAN_PORTUGUESE)
+
+    val selectionProvider = translationController.getAppLanguageSelection(PROFILE_ID_0)
+
+    val selection = monitorFactory.waitForNextSuccessfulResult(selectionProvider)
+    assertThat(selection.selectionTypeCase).isEqualTo(SELECTED_APP_LANGUAGE)
+    assertThat(selection.selectedLanguage).isEqualTo(BRAZILIAN_PORTUGUESE)
+  }
+
+  @Test
+  fun testGetAppLanguageSelection_updateLanguageToUseSystem_returnsSystemSelection() {
+    forceDefaultLocale(Locale.ROOT)
+    ensureAppLanguageIsUpdatedToUseSystem(PROFILE_ID_0)
+
+    val selectionProvider = translationController.getAppLanguageSelection(PROFILE_ID_0)
+
+    val selection = monitorFactory.waitForNextSuccessfulResult(selectionProvider)
+    assertThat(selection.selectionTypeCase).isEqualTo(USE_SYSTEM_LANGUAGE_OR_APP_DEFAULT)
+  }
+
+  @Test
+  fun testGetAppLanguageSelection_useSystemLang_updateLocale_doesNotNotifyProviderWithNewLocale() {
+    forceDefaultLocale(Locale.ROOT)
+    ensureAppLanguageIsUpdatedToUseSystem(PROFILE_ID_0)
+    val selectionProvider = translationController.getAppLanguageSelection(PROFILE_ID_0)
+    val monitor = monitorFactory.createMonitor(selectionProvider)
+    monitor.waitForNextSuccessResult()
+
+    localeController.setAsDefault(createDisplayLocaleForLanguage(HINDI), Configuration())
+
+    // The data provider shouldn't be updated. English will continue to be reported for the data
+    // provider, but the actual app strings are allowed to use Hindi per the override.
+    monitor.verifyProviderIsNotUpdated()
+  }
+
+  @Test
+  fun testGetAppLanguageSelection_updateLangToEnglish_differentProfile_returnsDifferentSelection() {
+    forceDefaultLocale(Locale.ROOT)
+    ensureAppLanguageIsUpdatedTo(PROFILE_ID_1, ENGLISH)
+    ensureAppLanguageIsUpdatedTo(PROFILE_ID_0, HINDI)
+
+    val selectionProvider = translationController.getAppLanguageSelection(PROFILE_ID_1)
+
+    // English is returned since the selection is being fetched for a different profile.
+    val selection = monitorFactory.waitForNextSuccessfulResult(selectionProvider)
+    assertThat(selection.selectionTypeCase).isEqualTo(SELECTED_APP_LANGUAGE)
+    assertThat(selection.selectedLanguage).isEqualTo(ENGLISH)
+  }
+
+  @Test
+  fun testUpdateAppLanguage_uninitializedToSystem_returnsUninitializedSelection() {
+    forceDefaultLocale(Locale.ROOT)
+
+    val updateProvider = translationController.updateAppLanguage(
+      PROFILE_ID_0,
+      AppLanguageSelection.newBuilder().apply { useSystemLanguageOrAppDefault = true }.build()
+    )
+
+    // The previous selection was uninitialized.
+    val selection = monitorFactory.waitForNextSuccessfulResult(updateProvider)
+    assertThat(selection).isEqualToDefaultInstance()
+  }
+
+  @Test
+  fun testUpdateAppLanguage_uninitializedToEnglish_returnsUninitializedSelection() {
+    forceDefaultLocale(Locale.ROOT)
+
+    val updateProvider = translationController.updateAppLanguage(
+      PROFILE_ID_0,
+      AppLanguageSelection.newBuilder().apply { selectedLanguage = ENGLISH }.build()
+    )
+
+    // The previous selection was uninitialized.
+    val selection = monitorFactory.waitForNextSuccessfulResult(updateProvider)
+    assertThat(selection).isEqualToDefaultInstance()
+  }
+
+  @Test
+  fun testUpdateAppLanguage_systemToEnglish_returnsSystemSelection() {
+    forceDefaultLocale(Locale.ROOT)
+    ensureAppLanguageIsUpdatedToUseSystem(PROFILE_ID_0)
+
+    val updateProvider = translationController.updateAppLanguage(
+      PROFILE_ID_0,
+      AppLanguageSelection.newBuilder().apply { selectedLanguage = ENGLISH }.build()
+    )
+
+    // The previous selection was system language.
+    val selection = monitorFactory.waitForNextSuccessfulResult(updateProvider)
+    assertThat(selection.selectionTypeCase).isEqualTo(USE_SYSTEM_LANGUAGE_OR_APP_DEFAULT)
+  }
+
+  @Test
+  fun testUpdateAppLanguage_englishToPortuguese_returnsEnglishSelection() {
+    forceDefaultLocale(Locale.ROOT)
+    ensureAppLanguageIsUpdatedTo(PROFILE_ID_0, ENGLISH)
+
+    val updateProvider = translationController.updateAppLanguage(
+      PROFILE_ID_0,
+      AppLanguageSelection.newBuilder().apply { selectedLanguage = BRAZILIAN_PORTUGUESE }.build()
+    )
+
+    // The previous selection was English.
+    val selection = monitorFactory.waitForNextSuccessfulResult(updateProvider)
+    assertThat(selection.selectionTypeCase).isEqualTo(SELECTED_APP_LANGUAGE)
+    assertThat(selection.selectedLanguage).isEqualTo(ENGLISH)
+  }
+
   /* Tests for written translation content functions */
 
   @Test
@@ -595,6 +734,164 @@ class TranslationControllerTest {
     assertThat(context.languageDefinition.language).isEqualTo(ENGLISH)
   }
 
+  @Test
+  fun testGetWrittenContentSelection_uninitialized_englishLocale_returnsDefaultSelection() {
+    forceDefaultLocale(Locale.ROOT)
+
+    val selectionProvider =
+      translationController.getWrittenTranslationContentLanguageSelection(PROFILE_ID_0)
+
+    val selection = monitorFactory.waitForNextSuccessfulResult(selectionProvider)
+    assertThat(selection).isEqualToDefaultInstance()
+  }
+
+  @Test
+  fun testGetWrittenContentSelection_updateLanguageToEnglish_returnsEnglishSelection() {
+    forceDefaultLocale(Locale.ROOT)
+    ensureAppLanguageIsUpdatedTo(PROFILE_ID_0, ARABIC)
+    ensureWrittenTranslationsLanguageIsUpdatedTo(PROFILE_ID_0, ENGLISH)
+
+    val selectionProvider =
+      translationController.getWrittenTranslationContentLanguageSelection(PROFILE_ID_0)
+
+    val selection = monitorFactory.waitForNextSuccessfulResult(selectionProvider)
+    assertThat(selection.selectionTypeCase).isEqualTo(SELECTED_WRITTEN_LANGUAGE)
+    assertThat(selection.selectedLanguage).isEqualTo(ENGLISH)
+  }
+
+  @Test
+  fun testGetWrittenContentSelection_updateLanguageToPortuguese_returnsPortugueseSelection() {
+    forceDefaultLocale(Locale.ROOT)
+    ensureAppLanguageIsUpdatedTo(PROFILE_ID_0, ARABIC)
+    ensureWrittenTranslationsLanguageIsUpdatedTo(PROFILE_ID_0, BRAZILIAN_PORTUGUESE)
+
+    val selectionProvider =
+      translationController.getWrittenTranslationContentLanguageSelection(PROFILE_ID_0)
+
+    val selection = monitorFactory.waitForNextSuccessfulResult(selectionProvider)
+    assertThat(selection.selectionTypeCase).isEqualTo(SELECTED_WRITTEN_LANGUAGE)
+    assertThat(selection.selectedLanguage).isEqualTo(BRAZILIAN_PORTUGUESE)
+  }
+
+  @Test
+  fun testGetWrittenContentSelection_updateLanguageToUseApp_returnsAppLangSelection() {
+    forceDefaultLocale(Locale.ROOT)
+    ensureAppLanguageIsUpdatedTo(PROFILE_ID_0, ARABIC)
+    ensureWrittenTranslationsLanguageIsUpdatedToUseApp(PROFILE_ID_0)
+
+    val selectionProvider =
+      translationController.getWrittenTranslationContentLanguageSelection(PROFILE_ID_0)
+
+    val selection = monitorFactory.waitForNextSuccessfulResult(selectionProvider)
+    assertThat(selection.selectionTypeCase).isEqualTo(USE_APP_WRITTEN_LANGUAGE)
+  }
+
+  @Test
+  fun testGetWrittenContentSelection_useAppLang_updateAppLanguage_notifiesProviderWithNewLang() {
+    ensureWrittenTranslationsLanguageIsUpdatedTo(PROFILE_ID_0, HINDI)
+    ensureAppLanguageIsUpdatedToUseSystem(PROFILE_ID_0)
+    forceDefaultLocale(Locale.US)
+    ensureWrittenTranslationsLanguageIsUpdatedToUseApp(PROFILE_ID_0)
+
+    ensureAppLanguageIsUpdatedTo(PROFILE_ID_0, BRAZILIAN_PORTUGUESE)
+    val selectionProvider =
+      translationController.getWrittenTranslationContentLanguageSelection(PROFILE_ID_0)
+
+    // Changing the app language should change the provided selection since this provider depends on
+    // the app strings language.
+    val selection = monitorFactory.waitForNextSuccessfulResult(selectionProvider)
+    assertThat(selection.selectionTypeCase).isEqualTo(USE_APP_WRITTEN_LANGUAGE)
+  }
+
+  @Test
+  fun testGetWrittenContentSelection_useSysLangForApp_updateLocale_doesNotNotifyProvWithNewLang() {
+    ensureAppLanguageIsUpdatedToUseSystem(PROFILE_ID_0)
+    forceDefaultLocale(Locale.US)
+    ensureWrittenTranslationsLanguageIsUpdatedToUseApp(PROFILE_ID_0)
+
+    localeController.setAsDefault(createDisplayLocaleForLanguage(HINDI), Configuration())
+    val selectionProvider =
+      translationController.getWrittenTranslationContentLanguageSelection(PROFILE_ID_0)
+
+    // Changing the locale isn't sufficient unless the system locale also changes.
+    val selection = monitorFactory.waitForNextSuccessfulResult(selectionProvider)
+    assertThat(selection.selectionTypeCase).isEqualTo(USE_APP_WRITTEN_LANGUAGE)
+  }
+
+  @Test
+  fun testGetWrittenContentSelection_updateLangToEnglish_diffProfile_returnsDifferentSelection() {
+    forceDefaultLocale(Locale.ROOT)
+    ensureWrittenTranslationsLanguageIsUpdatedTo(PROFILE_ID_1, ENGLISH)
+    ensureWrittenTranslationsLanguageIsUpdatedTo(PROFILE_ID_0, HINDI)
+
+    val selectionProvider =
+      translationController.getWrittenTranslationContentLanguageSelection(PROFILE_ID_1)
+
+    // English is returned since the selection is being fetched for a different profile.
+    val selection = monitorFactory.waitForNextSuccessfulResult(selectionProvider)
+    assertThat(selection.selectionTypeCase).isEqualTo(SELECTED_WRITTEN_LANGUAGE)
+    assertThat(selection.selectedLanguage).isEqualTo(ENGLISH)
+  }
+
+  @Test
+  fun testUpdateWrittenContentLanguage_uninitializedToUseApp_returnsUninitializedSelection() {
+    forceDefaultLocale(Locale.ROOT)
+
+    val updateProvider = translationController.updateWrittenTranslationContentLanguage(
+      PROFILE_ID_0,
+      WrittenTranslationLanguageSelection.newBuilder().apply { useAppLanguage = true }.build()
+    )
+
+    // The previous selection was uninitialized.
+    val selection = monitorFactory.waitForNextSuccessfulResult(updateProvider)
+    assertThat(selection).isEqualToDefaultInstance()
+  }
+
+  @Test
+  fun testUpdateWrittenContentLanguage_uninitializedToEnglish_returnsUninitializedSelection() {
+    forceDefaultLocale(Locale.ROOT)
+
+    val updateProvider = translationController.updateWrittenTranslationContentLanguage(
+      PROFILE_ID_0,
+      WrittenTranslationLanguageSelection.newBuilder().apply { selectedLanguage = ENGLISH }.build()
+    )
+
+    // The previous selection was uninitialized.
+    val selection = monitorFactory.waitForNextSuccessfulResult(updateProvider)
+    assertThat(selection).isEqualToDefaultInstance()
+  }
+
+  @Test
+  fun testUpdateWrittenContentLanguage_useAppToEnglish_returnsUseAppSelection() {
+    forceDefaultLocale(Locale.ROOT)
+    ensureWrittenTranslationsLanguageIsUpdatedToUseApp(PROFILE_ID_0)
+
+    val updateProvider = translationController.updateWrittenTranslationContentLanguage(
+      PROFILE_ID_0,
+      WrittenTranslationLanguageSelection.newBuilder().apply { selectedLanguage = ENGLISH }.build()
+    )
+
+    // The previous selection was to use the app language.
+    val selection = monitorFactory.waitForNextSuccessfulResult(updateProvider)
+    assertThat(selection.selectionTypeCase).isEqualTo(USE_APP_WRITTEN_LANGUAGE)
+  }
+
+  @Test
+  fun testUpdateWrittenContentLanguage_englishToHindi_returnsEnglishSelection() {
+    forceDefaultLocale(Locale.ROOT)
+    ensureWrittenTranslationsLanguageIsUpdatedTo(PROFILE_ID_0, ENGLISH)
+
+    val updateProvider = translationController.updateWrittenTranslationContentLanguage(
+      PROFILE_ID_0,
+      WrittenTranslationLanguageSelection.newBuilder().apply { selectedLanguage = HINDI }.build()
+    )
+
+    // The previous selection was English.
+    val selection = monitorFactory.waitForNextSuccessfulResult(updateProvider)
+    assertThat(selection.selectionTypeCase).isEqualTo(SELECTED_WRITTEN_LANGUAGE)
+    assertThat(selection.selectedLanguage).isEqualTo(ENGLISH)
+  }
+
   /* Tests for audio translation content functions */
 
   @Test
@@ -843,6 +1140,164 @@ class TranslationControllerTest {
     assertThat(context.languageDefinition.language).isEqualTo(ENGLISH)
   }
 
+  @Test
+  fun testGetAudioContentSelection_uninitialized_englishLocale_returnsDefaultSelection() {
+    forceDefaultLocale(Locale.ROOT)
+
+    val selectionProvider =
+      translationController.getAudioTranslationContentLanguageSelection(PROFILE_ID_0)
+
+    val selection = monitorFactory.waitForNextSuccessfulResult(selectionProvider)
+    assertThat(selection).isEqualToDefaultInstance()
+  }
+
+  @Test
+  fun testGetAudioContentSelection_updateLanguageToEnglish_returnsEnglishSelection() {
+    forceDefaultLocale(Locale.ROOT)
+    ensureAppLanguageIsUpdatedTo(PROFILE_ID_0, ARABIC)
+    ensureAudioTranslationsLanguageIsUpdatedTo(PROFILE_ID_0, ENGLISH)
+
+    val selectionProvider =
+      translationController.getAudioTranslationContentLanguageSelection(PROFILE_ID_0)
+
+    val selection = monitorFactory.waitForNextSuccessfulResult(selectionProvider)
+    assertThat(selection.selectionTypeCase).isEqualTo(SELECTED_AUDIO_LANGUAGE)
+    assertThat(selection.selectedLanguage).isEqualTo(ENGLISH)
+  }
+
+  @Test
+  fun testGetAudioContentSelection_updateLanguageToPortuguese_returnsPortugueseSelection() {
+    forceDefaultLocale(Locale.ROOT)
+    ensureAppLanguageIsUpdatedTo(PROFILE_ID_0, ARABIC)
+    ensureAudioTranslationsLanguageIsUpdatedTo(PROFILE_ID_0, BRAZILIAN_PORTUGUESE)
+
+    val selectionProvider =
+      translationController.getAudioTranslationContentLanguageSelection(PROFILE_ID_0)
+
+    val selection = monitorFactory.waitForNextSuccessfulResult(selectionProvider)
+    assertThat(selection.selectionTypeCase).isEqualTo(SELECTED_AUDIO_LANGUAGE)
+    assertThat(selection.selectedLanguage).isEqualTo(BRAZILIAN_PORTUGUESE)
+  }
+
+  @Test
+  fun testGetAudioContentSelection_updateLanguageToUseApp_returnsAppLangSelection() {
+    forceDefaultLocale(Locale.ROOT)
+    ensureAppLanguageIsUpdatedTo(PROFILE_ID_0, ARABIC)
+    ensureAudioTranslationsLanguageIsUpdatedToUseApp(PROFILE_ID_0)
+
+    val selectionProvider =
+      translationController.getAudioTranslationContentLanguageSelection(PROFILE_ID_0)
+
+    val selection = monitorFactory.waitForNextSuccessfulResult(selectionProvider)
+    assertThat(selection.selectionTypeCase).isEqualTo(USE_APP_AUDIO_LANGUAGE)
+  }
+
+  @Test
+  fun testGetAudioContentSelection_useAppLang_updateAppLanguage_notifiesProviderWithNewLang() {
+    ensureAudioTranslationsLanguageIsUpdatedTo(PROFILE_ID_0, HINDI)
+    ensureAppLanguageIsUpdatedToUseSystem(PROFILE_ID_0)
+    forceDefaultLocale(Locale.US)
+    ensureAudioTranslationsLanguageIsUpdatedToUseApp(PROFILE_ID_0)
+
+    ensureAppLanguageIsUpdatedTo(PROFILE_ID_0, BRAZILIAN_PORTUGUESE)
+    val selectionProvider =
+      translationController.getAudioTranslationContentLanguageSelection(PROFILE_ID_0)
+
+    // Changing the app language should change the provided selection since this provider depends on
+    // the app strings language.
+    val selection = monitorFactory.waitForNextSuccessfulResult(selectionProvider)
+    assertThat(selection.selectionTypeCase).isEqualTo(USE_APP_AUDIO_LANGUAGE)
+  }
+
+  @Test
+  fun testGetAudioContentSelection_useSysLangForApp_updateLocale_doesNotNotifyProvWithNewLang() {
+    ensureAppLanguageIsUpdatedToUseSystem(PROFILE_ID_0)
+    forceDefaultLocale(Locale.US)
+    ensureAudioTranslationsLanguageIsUpdatedToUseApp(PROFILE_ID_0)
+
+    localeController.setAsDefault(createDisplayLocaleForLanguage(HINDI), Configuration())
+    val selectionProvider =
+      translationController.getAudioTranslationContentLanguageSelection(PROFILE_ID_0)
+
+    // Changing the locale isn't sufficient unless the system locale also changes.
+    val selection = monitorFactory.waitForNextSuccessfulResult(selectionProvider)
+    assertThat(selection.selectionTypeCase).isEqualTo(USE_APP_AUDIO_LANGUAGE)
+  }
+
+  @Test
+  fun testGetAudioContentSelection_updateLangToEnglish_diffProfile_returnsDifferentSelection() {
+    forceDefaultLocale(Locale.ROOT)
+    ensureAudioTranslationsLanguageIsUpdatedTo(PROFILE_ID_1, ENGLISH)
+    ensureAudioTranslationsLanguageIsUpdatedTo(PROFILE_ID_0, HINDI)
+
+    val selectionProvider =
+      translationController.getAudioTranslationContentLanguageSelection(PROFILE_ID_1)
+
+    // English is returned since the selection is being fetched for a different profile.
+    val selection = monitorFactory.waitForNextSuccessfulResult(selectionProvider)
+    assertThat(selection.selectionTypeCase).isEqualTo(SELECTED_AUDIO_LANGUAGE)
+    assertThat(selection.selectedLanguage).isEqualTo(ENGLISH)
+  }
+
+  @Test
+  fun testGetAudioContentSelection_uninitializedToUseApp_returnsUninitializedSelection() {
+    forceDefaultLocale(Locale.ROOT)
+
+    val updateProvider = translationController.updateAudioTranslationContentLanguage(
+      PROFILE_ID_0,
+      AudioTranslationLanguageSelection.newBuilder().apply { useAppLanguage = true }.build()
+    )
+
+    // The previous selection was uninitialized.
+    val selection = monitorFactory.waitForNextSuccessfulResult(updateProvider)
+    assertThat(selection).isEqualToDefaultInstance()
+  }
+
+  @Test
+  fun testGetAudioContentSelection_uninitializedToEnglish_returnsUninitializedSelection() {
+    forceDefaultLocale(Locale.ROOT)
+
+    val updateProvider = translationController.updateAudioTranslationContentLanguage(
+      PROFILE_ID_0,
+      AudioTranslationLanguageSelection.newBuilder().apply { selectedLanguage = ENGLISH }.build()
+    )
+
+    // The previous selection was uninitialized.
+    val selection = monitorFactory.waitForNextSuccessfulResult(updateProvider)
+    assertThat(selection).isEqualToDefaultInstance()
+  }
+
+  @Test
+  fun testGetAudioContentSelection_useAppToEnglish_returnsUseAppSelection() {
+    forceDefaultLocale(Locale.ROOT)
+    ensureAudioTranslationsLanguageIsUpdatedToUseApp(PROFILE_ID_0)
+
+    val updateProvider = translationController.updateAudioTranslationContentLanguage(
+      PROFILE_ID_0,
+      AudioTranslationLanguageSelection.newBuilder().apply { selectedLanguage = ENGLISH }.build()
+    )
+
+    // The previous selection was to use the app language.
+    val selection = monitorFactory.waitForNextSuccessfulResult(updateProvider)
+    assertThat(selection.selectionTypeCase).isEqualTo(USE_APP_AUDIO_LANGUAGE)
+  }
+
+  @Test
+  fun testGetAudioContentSelection_englishToHindi_returnsEnglishSelection() {
+    forceDefaultLocale(Locale.ROOT)
+    ensureAudioTranslationsLanguageIsUpdatedTo(PROFILE_ID_0, ENGLISH)
+
+    val updateProvider = translationController.updateAudioTranslationContentLanguage(
+      PROFILE_ID_0,
+      AudioTranslationLanguageSelection.newBuilder().apply { selectedLanguage = HINDI }.build()
+    )
+
+    // The previous selection was English.
+    val selection = monitorFactory.waitForNextSuccessfulResult(updateProvider)
+    assertThat(selection.selectionTypeCase).isEqualTo(SELECTED_AUDIO_LANGUAGE)
+    assertThat(selection.selectedLanguage).isEqualTo(ENGLISH)
+  }
+
   /* Tests for string extraction functions */
 
   @Test
diff --git a/model/src/main/proto/BUILD.bazel b/model/src/main/proto/BUILD.bazel
index 5e896022364..3751a304dc7 100644
--- a/model/src/main/proto/BUILD.bazel
+++ b/model/src/main/proto/BUILD.bazel
@@ -43,7 +43,10 @@ java_lite_proto_library(
 oppia_proto_library(
     name = "event_logger_proto",
     srcs = ["oppia_logger.proto"],
-    deps = [":exploration_proto"],
+    deps = [
+        ":exploration_proto",
+        ":languages_proto",
+    ],
 )
 
 java_lite_proto_library(
diff --git a/model/src/main/proto/oppia_logger.proto b/model/src/main/proto/oppia_logger.proto
index a27dd9cd88a..77db3474008 100644
--- a/model/src/main/proto/oppia_logger.proto
+++ b/model/src/main/proto/oppia_logger.proto
@@ -3,6 +3,7 @@ syntax = "proto3";
 package model;
 
 import "exploration.proto";
+import "languages.proto";
 
 option java_package = "org.oppia.android.app.model";
 option java_multiple_files = true;
@@ -11,13 +12,25 @@ option java_multiple_files = true;
 message EventLog {
   // The timestamp of the event.
   int64 timestamp = 1;
+
   // Deprecated Event Action. This is now handled via the context below.
   reserved 2;
+
   // The priority of the event.
   Priority priority = 3;
+
   // The activity context of the event.
   Context context = 4;
 
+  // The app language selection context at the time of this event's creation.
+  AppLanguageSelection app_language_selection = 5;
+
+  // The written language selection context at the time of this event's creation.
+  WrittenTranslationLanguageSelection written_translation_language_selection = 6;
+
+  // The audio language selection context at the time of this event's creation.
+  AudioTranslationLanguageSelection audio_translation_language_selection = 7;
+
   // Structure of an activity context.
   message Context {
     // Deprecated exploration context. This is now handled via the open_exploration_activity context
@@ -67,9 +80,12 @@ message EventLog {
       // The event being logged is related to the opening of concept card.
       ConceptCardContext open_concept_card = 14;
 
-      // The event being logged is related to the opening of revision card.
+      // The event being logged is related to the opening of a revision card.
       RevisionCardContext open_revision_card = 15;
 
+      // The event being logged is related to the closing of a revision card.
+      RevisionCardContext close_revision_card = 36;
+
       // The event being logged is related to starting an exploration card.
       CardContext start_card_context = 16;
 
@@ -77,13 +93,13 @@ message EventLog {
       CardContext end_card_context = 17;
 
       // The event being logged is related to offering a hint when it becomes available.
-      HintContext hint_offered_context = 18;
+      HintContext hint_unlocked_context = 18;
 
       // The event being logged is related to accessing a hint.
       HintContext access_hint_context = 19;
 
       // The event being logged is related to offering a solution when it becomes available.
-      ExplorationContext solution_offered_context = 20;
+      ExplorationContext solution_unlocked_context = 20;
 
       // The event being logged is related to accessing a solution.
       ExplorationContext access_solution_context = 21;
@@ -130,6 +146,10 @@ message EventLog {
       // engagement in a lesson.
       ExplorationContext reach_invested_engagement = 34;
 
+      // The event being logged indicates that the user switched their lesson's content language
+      // using the in-lesson language switcher.
+      SwitchInLessonLanguageEventContext switch_in_lesson_language = 37;
+
       // Indicates that something went wrong when trying to log a learner analytics even for the
       // device corresponding to the specified device ID.
       string install_id_for_failed_analytics_log = 33;
@@ -259,6 +279,20 @@ message EventLog {
     LearnerDetailsContext learner_details = 7;
   }
 
+  // Represents the event context for switching a lesson's content language mid-lesson. Note that
+  // this differs from the language selection available via the options menu since the latter
+  // changes the app language rather than just specifically the content language.
+  message SwitchInLessonLanguageEventContext {
+    // Defined attributes that are common among other exploration related event log contexts.
+    ExplorationContext exploration_details = 1;
+
+    // The content language from which the lesson is being switched.
+    OppiaLanguage switch_from_language = 2;
+
+    // The content language to which the lesson is being switched.
+    OppiaLanguage switch_to_language = 3;
+  }
+
   // Supported priority of events for event logging
   enum Priority {
     // The undefined priority of an event
diff --git a/model/src/main/proto/profile.proto b/model/src/main/proto/profile.proto
index 012c815aead..e0e9eb59581 100644
--- a/model/src/main/proto/profile.proto
+++ b/model/src/main/proto/profile.proto
@@ -51,6 +51,10 @@ message Profile {
   // Determines whether profile can download content.
   bool allow_download_access = 7;
 
+  // Determines whether the profile's user is allowed to quickly switching between content languages
+  // inside of a lesson.
+  bool allow_in_lesson_quick_language_switching = 16;
+
   // Represents the time the user was last logged in.
   int64 last_logged_in_timestamp_ms = 8;
 
diff --git a/scripts/assets/kdoc_validity_exemptions.textproto b/scripts/assets/kdoc_validity_exemptions.textproto
index 24f10c166ef..341faf51068 100644
--- a/scripts/assets/kdoc_validity_exemptions.textproto
+++ b/scripts/assets/kdoc_validity_exemptions.textproto
@@ -279,7 +279,6 @@ exempted_file_path: "app/src/main/java/org/oppia/android/app/topic/revision/Revi
 exempted_file_path: "app/src/main/java/org/oppia/android/app/topic/revision/TopicRevisionFragment.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentPresenter.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/topic/revision/TopicRevisionViewModel.kt"
-exempted_file_path: "app/src/main/java/org/oppia/android/app/topic/revisioncard/ReturnToTopicClickListener.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivity.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityPresenter.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardFragment.kt"
@@ -323,7 +322,6 @@ exempted_file_path: "domain/src/main/java/org/oppia/android/domain/exploration/E
 exempted_file_path: "domain/src/main/java/org/oppia/android/domain/exploration/lightweightcheckpointing/ExplorationCheckpointController.kt"
 exempted_file_path: "domain/src/main/java/org/oppia/android/domain/oppialogger/LogStorageModule.kt"
 exempted_file_path: "domain/src/main/java/org/oppia/android/domain/oppialogger/loguploader/LogUploadWorker.kt"
-exempted_file_path: "domain/src/main/java/org/oppia/android/domain/profile/ProfileManagementController.kt"
 exempted_file_path: "domain/src/main/java/org/oppia/android/domain/question/QuestionAssessmentProgress.kt"
 exempted_file_path: "domain/src/main/java/org/oppia/android/domain/question/QuestionConstantsProvider.kt"
 exempted_file_path: "domain/src/main/java/org/oppia/android/domain/question/QuestionTrainingConstantsProvider.kt"
diff --git a/scripts/assets/test_file_exemptions.textproto b/scripts/assets/test_file_exemptions.textproto
index f688366a3a9..47768855e26 100644
--- a/scripts/assets/test_file_exemptions.textproto
+++ b/scripts/assets/test_file_exemptions.textproto
@@ -39,6 +39,7 @@ exempted_file_path: "app/src/main/java/org/oppia/android/app/administratorcontro
 exempted_file_path: "app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdFragmentPresenter.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileLearnerIdItemViewModel.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileListViewModel.kt"
+exempted_file_path: "app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ShareIdsViewModel.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/SyncStatusItemViewModel.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/application/AbstractOppiaApplication.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/application/ActivityComponentFactory.kt"
@@ -822,7 +823,6 @@ exempted_file_path: "utility/src/main/java/org/oppia/android/util/networking/Net
 exempted_file_path: "utility/src/main/java/org/oppia/android/util/networking/NetworkConnectionUtil.kt"
 exempted_file_path: "utility/src/main/java/org/oppia/android/util/parser/html/ExplorationHtmlParserEntityType.kt"
 exempted_file_path: "utility/src/main/java/org/oppia/android/util/parser/html/HtmlParserEntityTypeModule.kt"
-exempted_file_path: "utility/src/main/java/org/oppia/android/util/parser/html/ListItemMark.kt"
 exempted_file_path: "utility/src/main/java/org/oppia/android/util/parser/html/PolicyType.kt"
 exempted_file_path: "utility/src/main/java/org/oppia/android/util/parser/image/BitmapBlurTransformation.kt"
 exempted_file_path: "utility/src/main/java/org/oppia/android/util/parser/image/BitmapBlurrer.kt"
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 ec054d028b2..bca42e39c80 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
@@ -1,6 +1,7 @@
 package org.oppia.android.testing.logging
 
 import com.google.common.truth.BooleanSubject
+import com.google.common.truth.ComparableSubject
 import com.google.common.truth.FailureMetadata
 import com.google.common.truth.IntegerSubject
 import com.google.common.truth.IterableSubject
@@ -9,16 +10,20 @@ import com.google.common.truth.StringSubject
 import com.google.common.truth.Truth.assertAbout
 import com.google.common.truth.Truth.assertThat
 import com.google.common.truth.extensions.proto.LiteProtoSubject
+import org.oppia.android.app.model.AppLanguageSelection
+import org.oppia.android.app.model.AppLanguageSelection.SelectionTypeCase.USE_SYSTEM_LANGUAGE_OR_APP_DEFAULT
+import org.oppia.android.app.model.AudioTranslationLanguageSelection
 import org.oppia.android.app.model.EventLog
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.ACCESS_HINT_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.ACCESS_SOLUTION_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.APP_IN_BACKGROUND_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.APP_IN_FOREGROUND_CONTEXT
+import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.CLOSE_REVISION_CARD
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.DELETE_PROFILE_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.END_CARD_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.EXIT_EXPLORATION_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.FINISH_EXPLORATION_CONTEXT
-import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.HINT_OFFERED_CONTEXT
+import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.HINT_UNLOCKED_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.INSTALL_ID_FOR_FAILED_ANALYTICS_LOG
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.OPEN_CONCEPT_CARD
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.OPEN_EXPLORATION_ACTIVITY
@@ -35,10 +40,13 @@ import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.PAUSE_VO
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.PLAY_VOICE_OVER_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.REACH_INVESTED_ENGAGEMENT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.RESUME_EXPLORATION_CONTEXT
-import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.SOLUTION_OFFERED_CONTEXT
+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_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
+import org.oppia.android.app.model.OppiaLanguage
+import org.oppia.android.app.model.WrittenTranslationLanguageSelection
 
 // TODO(#4272): Add tests for this class.
 
@@ -79,6 +87,33 @@ class EventLogSubject private constructor(
     assertThat(actual.priority).isEqualTo(EventLog.Priority.OPTIONAL)
   }
 
+  /**
+   * Returns an [AppLanguageSelectionSubject] to verify the under-test [EventLog]'s
+   * [EventLog.getAppLanguageSelection] field.
+   */
+  fun hasAppLanguageSelectionThat(): AppLanguageSelectionSubject =
+    AppLanguageSelectionSubject.assertThat(actual.appLanguageSelection)
+
+  /**
+   * Returns an [WrittenTranslationLanguageSelectionSubject] to verify the under-test [EventLog]'s
+   * [EventLog.getWrittenTranslationLanguageSelection] field.
+   */
+  fun hasWrittenTranslationLanguageSelectionThat(): WrittenTranslationLanguageSelectionSubject {
+    return WrittenTranslationLanguageSelectionSubject.assertThat(
+      actual.writtenTranslationLanguageSelection
+    )
+  }
+
+  /**
+   * Returns an [AudioTranslationLanguageSelectionSubject] to verify the under-test [EventLog]'s
+   * [EventLog.getAudioTranslationLanguageSelection] field.
+   */
+  fun hasAudioTranslationLanguageSelectionThat(): AudioTranslationLanguageSelectionSubject {
+    return AudioTranslationLanguageSelectionSubject.assertThat(
+      actual.audioTranslationLanguageSelection
+    )
+  }
+
   /**
    * Verifies that the [EventLog] under test has a context corresponding to
    * [OPEN_EXPLORATION_ACTIVITY] (per [EventLog.Context.getActivityContextCase]).
@@ -335,6 +370,32 @@ class EventLogSubject private constructor(
     hasOpenRevisionCardContextThat().block()
   }
 
+  /**
+   * Verifies that the [EventLog] under test has a context corresponding to [CLOSE_REVISION_CARD]
+   * (per [EventLog.Context.getActivityContextCase]).
+   */
+  fun hasCloseRevisionCardContext() {
+    assertThat(actual.context.activityContextCase).isEqualTo(CLOSE_REVISION_CARD)
+  }
+
+  /**
+   * Verifies the [EventLog]'s context per [hasCloseRevisionCardContext] and returns a
+   * [RevisionCardContextSubject] to test the corresponding context.
+   */
+  fun hasCloseRevisionCardContextThat(): RevisionCardContextSubject {
+    hasCloseRevisionCardContext()
+    return RevisionCardContextSubject.assertThat(actual.context.closeRevisionCard)
+  }
+
+  /**
+   * Verifies the [EventLog]'s context and executes [block] in the same way as
+   * [hasOpenExplorationActivityContextThat] except for the conditions of, and subject returned by,
+   * [hasCloseRevisionCardContextThat].
+   */
+  fun hasCloseRevisionCardContextThat(block: RevisionCardContextSubject.() -> Unit) {
+    hasCloseRevisionCardContextThat().block()
+  }
+
   /**
    * Verifies that the [EventLog] under test has a context corresponding to [START_CARD_CONTEXT]
    * (per [EventLog.Context.getActivityContextCase]).
@@ -388,29 +449,29 @@ class EventLogSubject private constructor(
   }
 
   /**
-   * Verifies that the [EventLog] under test has a context corresponding to [HINT_OFFERED_CONTEXT]
+   * Verifies that the [EventLog] under test has a context corresponding to [HINT_UNLOCKED_CONTEXT]
    * (per [EventLog.Context.getActivityContextCase]).
    */
-  fun hasHintOfferedContext() {
-    assertThat(actual.context.activityContextCase).isEqualTo(HINT_OFFERED_CONTEXT)
+  fun hasHintUnlockedContext() {
+    assertThat(actual.context.activityContextCase).isEqualTo(HINT_UNLOCKED_CONTEXT)
   }
 
   /**
-   * Verifies the [EventLog]'s context per [hasHintOfferedContext] and returns a
+   * Verifies the [EventLog]'s context per [hasHintUnlockedContext] and returns a
    * [HintContextSubject] to test the corresponding context.
    */
-  fun hasHintOfferedContextThat(): HintContextSubject {
-    hasHintOfferedContext()
-    return HintContextSubject.assertThat(actual.context.hintOfferedContext)
+  fun hasHintUnlockedContextThat(): HintContextSubject {
+    hasHintUnlockedContext()
+    return HintContextSubject.assertThat(actual.context.hintUnlockedContext)
   }
 
   /**
    * Verifies the [EventLog]'s context and executes [block] in the same way as
    * [hasOpenExplorationActivityContextThat] except for the conditions of, and subject returned by,
-   * [hasHintOfferedContextThat].
+   * [hasHintUnlockedContextThat].
    */
-  fun hasHintOfferedContextThat(block: HintContextSubject.() -> Unit) {
-    hasHintOfferedContextThat().block()
+  fun hasHintUnlockedContextThat(block: HintContextSubject.() -> Unit) {
+    hasHintUnlockedContextThat().block()
   }
 
   /**
@@ -441,28 +502,28 @@ class EventLogSubject private constructor(
 
   /**
    * Verifies that the [EventLog] under test has a context corresponding to
-   * [SOLUTION_OFFERED_CONTEXT] (per [EventLog.Context.getActivityContextCase]).
+   * [SOLUTION_UNLOCKED_CONTEXT] (per [EventLog.Context.getActivityContextCase]).
    */
-  fun hasSolutionOfferedContext() {
-    assertThat(actual.context.activityContextCase).isEqualTo(SOLUTION_OFFERED_CONTEXT)
+  fun hasSolutionUnlockedContext() {
+    assertThat(actual.context.activityContextCase).isEqualTo(SOLUTION_UNLOCKED_CONTEXT)
   }
 
   /**
-   * Verifies the [EventLog]'s context per [hasSolutionOfferedContext] and returns an
+   * Verifies the [EventLog]'s context per [hasSolutionUnlockedContext] and returns an
    * [ExplorationContextSubject] to test the corresponding context.
    */
-  fun hasSolutionOfferedContextThat(): ExplorationContextSubject {
-    hasSolutionOfferedContext()
-    return ExplorationContextSubject.assertThat(actual.context.solutionOfferedContext)
+  fun hasSolutionUnlockedContextThat(): ExplorationContextSubject {
+    hasSolutionUnlockedContext()
+    return ExplorationContextSubject.assertThat(actual.context.solutionUnlockedContext)
   }
 
   /**
    * Verifies the [EventLog]'s context and executes [block] in the same way as
    * [hasOpenExplorationActivityContextThat] except for the conditions of, and subject returned by,
-   * [hasSolutionOfferedContextThat].
+   * [hasSolutionUnlockedContextThat].
    */
-  fun hasSolutionOfferedContextThat(block: ExplorationContextSubject.() -> Unit) {
-    hasSolutionOfferedContextThat().block()
+  fun hasSolutionUnlockedContextThat(block: ExplorationContextSubject.() -> Unit) {
+    hasSolutionUnlockedContextThat().block()
   }
 
   /**
@@ -811,6 +872,36 @@ class EventLogSubject private constructor(
     hasReachedInvestedEngagementContextThat().block()
   }
 
+  /**
+   * Verifies that the [EventLog] under test has a context corresponding to
+   * [SWITCH_IN_LESSON_LANGUAGE] (per [EventLog.Context.getActivityContextCase]).
+   */
+  fun hasSwitchInLessonLanguageContext() {
+    assertThat(actual.context.activityContextCase).isEqualTo(SWITCH_IN_LESSON_LANGUAGE)
+  }
+
+  /**
+   * Verifies the [EventLog]'s context per [hasSwitchInLessonLanguageContext] and returns a
+   * [SwitchInLessonLanguageEventContextSubject] to test the corresponding context.
+   */
+  fun hasSwitchInLessonLanguageContextThat(): SwitchInLessonLanguageEventContextSubject {
+    hasSwitchInLessonLanguageContext()
+    return SwitchInLessonLanguageEventContextSubject.assertThat(
+      actual.context.switchInLessonLanguage
+    )
+  }
+
+  /**
+   * Verifies the [EventLog]'s context and executes [block] in the same way as
+   * [hasOpenExplorationActivityContextThat] except for the conditions of, and subject returned
+   * by, [hasSwitchInLessonLanguageContextThat].
+   */
+  fun hasSwitchInLessonLanguageContextThat(
+    block: SwitchInLessonLanguageEventContextSubject.() -> Unit
+  ) {
+    hasSwitchInLessonLanguageContextThat().block()
+  }
+
   /**
    * Verifies that the [EventLog] under test has a context corresponding to
    * [INSTALL_ID_FOR_FAILED_ANALYTICS_LOG] (per [EventLog.Context.getActivityContextCase]).
@@ -828,6 +919,154 @@ class EventLogSubject private constructor(
     return assertThat(actual.context.installIdForFailedAnalyticsLog)
   }
 
+  /**
+   * Truth subject for verifying properties of [AppLanguageSelection]s.
+   *
+   * Note that this class is also a [LiteProtoSubject] so other aspects of the underlying
+   * [AppLanguageSelection] proto can be verified through inherited methods.
+   *
+   * Call [AppLanguageSelectionSubject.assertThat] to create the subject.
+   */
+  class AppLanguageSelectionSubject private constructor(
+    metadata: FailureMetadata,
+    private val actual: AppLanguageSelection
+  ) : LiteProtoSubject(metadata, actual) {
+    /** Asserts that this selection corresponds to [USE_SYSTEM_LANGUAGE_OR_APP_DEFAULT]. */
+    fun isUseSystemLanguageOrAppDefault(): Unit =
+      assertThat(actual.selectionTypeCase).isEqualTo(USE_SYSTEM_LANGUAGE_OR_APP_DEFAULT)
+
+    /**
+     * Asserts that this selection corresponds to
+     * [AppLanguageSelection.SelectionTypeCase.SELECTED_LANGUAGE].
+     */
+    fun isSelectedLanguage() {
+      assertThat(actual.selectionTypeCase)
+        .isEqualTo(AppLanguageSelection.SelectionTypeCase.SELECTED_LANGUAGE)
+    }
+
+    /**
+     * Returns a [ComparableSubject] to test [AppLanguageSelection.getSelectedLanguage].
+     *
+     * This method never fails since the underlying property defaults to empty string if it's not
+     * defined in the context.
+     */
+    fun isSelectedLanguageThat(): ComparableSubject<OppiaLanguage> =
+      assertThat(actual.selectedLanguage)
+
+    companion object {
+      /**
+       * Returns a new [AppLanguageSelectionSubject] to verify aspects of the specified
+       * [AppLanguageSelection] value.
+       */
+      fun assertThat(actual: AppLanguageSelection): AppLanguageSelectionSubject =
+        assertAbout(::AppLanguageSelectionSubject).that(actual)
+    }
+  }
+
+  /**
+   * Truth subject for verifying properties of [WrittenTranslationLanguageSelection]s.
+   *
+   * Note that this class is also a [LiteProtoSubject] so other aspects of the underlying
+   * [WrittenTranslationLanguageSelection] proto can be verified through inherited methods.
+   *
+   * Call [WrittenTranslationLanguageSelectionSubject.assertThat] to create the subject.
+   */
+  class WrittenTranslationLanguageSelectionSubject private constructor(
+    metadata: FailureMetadata,
+    private val actual: WrittenTranslationLanguageSelection
+  ) : LiteProtoSubject(metadata, actual) {
+    /**
+     * Asserts that this selection corresponds to
+     * [WrittenTranslationLanguageSelection.SelectionTypeCase.USE_APP_LANGUAGE].
+     */
+    fun isUseAppLanguage() {
+      assertThat(actual.selectionTypeCase)
+        .isEqualTo(WrittenTranslationLanguageSelection.SelectionTypeCase.USE_APP_LANGUAGE)
+    }
+
+    /**
+     * Asserts that this selection corresponds to
+     * [WrittenTranslationLanguageSelection.SelectionTypeCase.SELECTED_LANGUAGE].
+     */
+    fun isSelectedLanguage() {
+      assertThat(actual.selectionTypeCase)
+        .isEqualTo(WrittenTranslationLanguageSelection.SelectionTypeCase.SELECTED_LANGUAGE)
+    }
+
+    /**
+     * Returns a [ComparableSubject] to test
+     * [WrittenTranslationLanguageSelection.getSelectedLanguage].
+     *
+     * This method never fails since the underlying property defaults to empty string if it's not
+     * defined in the context.
+     */
+    fun isSelectedLanguageThat(): ComparableSubject<OppiaLanguage> =
+      assertThat(actual.selectedLanguage)
+
+    companion object {
+      /**
+       * Returns a new [WrittenTranslationLanguageSelectionSubject] to verify aspects of the
+       * specified [WrittenTranslationLanguageSelection] value.
+       */
+      fun assertThat(
+        actual: WrittenTranslationLanguageSelection
+      ): WrittenTranslationLanguageSelectionSubject =
+        assertAbout(::WrittenTranslationLanguageSelectionSubject).that(actual)
+    }
+  }
+
+  /**
+   * Truth subject for verifying properties of [AudioTranslationLanguageSelection]s.
+   *
+   * Note that this class is also a [LiteProtoSubject] so other aspects of the underlying
+   * [AudioTranslationLanguageSelection] proto can be verified through inherited methods.
+   *
+   * Call [AudioTranslationLanguageSelectionSubject.assertThat] to create the subject.
+   */
+  class AudioTranslationLanguageSelectionSubject private constructor(
+    metadata: FailureMetadata,
+    private val actual: AudioTranslationLanguageSelection
+  ) : LiteProtoSubject(metadata, actual) {
+    /**
+     * Asserts that this selection corresponds to
+     * [AudioTranslationLanguageSelection.SelectionTypeCase.USE_APP_LANGUAGE].
+     */
+    fun isUseAppLanguage() {
+      assertThat(actual.selectionTypeCase)
+        .isEqualTo(AudioTranslationLanguageSelection.SelectionTypeCase.USE_APP_LANGUAGE)
+    }
+
+    /**
+     * Asserts that this selection corresponds to
+     * [AudioTranslationLanguageSelection.SelectionTypeCase.SELECTED_LANGUAGE].
+     */
+    fun isSelectedLanguage() {
+      assertThat(actual.selectionTypeCase)
+        .isEqualTo(AudioTranslationLanguageSelection.SelectionTypeCase.SELECTED_LANGUAGE)
+    }
+
+    /**
+     * Returns a [ComparableSubject] to test
+     * [AudioTranslationLanguageSelection.getSelectedLanguage].
+     *
+     * This method never fails since the underlying property defaults to empty string if it's not
+     * defined in the context.
+     */
+    fun isSelectedLanguageThat(): ComparableSubject<OppiaLanguage> =
+      assertThat(actual.selectedLanguage)
+
+    companion object {
+      /**
+       * Returns a new [AudioTranslationLanguageSelectionSubject] to verify aspects of the
+       * specified [AudioTranslationLanguageSelection] value.
+       */
+      fun assertThat(
+        actual: AudioTranslationLanguageSelection
+      ): AudioTranslationLanguageSelectionSubject =
+        assertAbout(::AudioTranslationLanguageSelectionSubject).that(actual)
+    }
+  }
+
   /**
    * Truth subject for verifying properties of [EventLog.CardContext]s.
    *
@@ -1326,6 +1565,68 @@ class EventLogSubject private constructor(
     }
   }
 
+  /**
+   * Truth subject for verifying properties of [EventLog.SwitchInLessonLanguageEventContext]s.
+   *
+   * Note that this class is also a [LiteProtoSubject] so other aspects of the underlying
+   * [EventLog.SwitchInLessonLanguageEventContext] proto can be verified through inherited methods.
+   *
+   * Call [SwitchInLessonLanguageEventContextSubject.assertThat] to create the subject.
+   */
+  class SwitchInLessonLanguageEventContextSubject private constructor(
+    metadata: FailureMetadata,
+    private val actual: EventLog.SwitchInLessonLanguageEventContext
+  ) : LiteProtoSubject(metadata, actual) {
+    /**
+     * Returns a [ExplorationContextSubject] to test
+     * [EventLog.SwitchInLessonLanguageEventContext.getExplorationDetails].
+     *
+     * This method never fails since the underlying property defaults to empty string if it's not
+     * defined in the context.
+     */
+    fun hasExplorationDetailsThat(): ExplorationContextSubject =
+      ExplorationContextSubject.assertThat(actual.explorationDetails)
+
+    /**
+     * Executes [block] in the context returned by [hasExplorationDetailsThat], similar to
+     * [hasOpenExplorationActivityContextThat].
+     */
+    fun hasExplorationDetailsThat(block: ExplorationContextSubject.() -> Unit) {
+      hasExplorationDetailsThat().block()
+    }
+
+    /**
+     * Returns a [ComparableSubject] to test
+     * [EventLog.SwitchInLessonLanguageEventContext.getSwitchFromLanguage].
+     *
+     * This method never fails since the underlying property defaults to empty string if it's not
+     * defined in the context.
+     */
+    fun hasSwitchFromLanguageThat(): ComparableSubject<OppiaLanguage> =
+      assertThat(actual.switchFromLanguage)
+
+    /**
+     * Returns a [ComparableSubject] to test
+     * [EventLog.SwitchInLessonLanguageEventContext.getSwitchToLanguage].
+     *
+     * This method never fails since the underlying property defaults to empty string if it's not
+     * defined in the context.
+     */
+    fun hasSwitchToLanguageThat(): ComparableSubject<OppiaLanguage> =
+      assertThat(actual.switchToLanguage)
+
+    companion object {
+      /**
+       * Returns a new [TopicContextSubject] to verify aspects of the specified
+       * [EventLog.TopicContext] value.
+       */
+      fun assertThat(
+        actual: EventLog.SwitchInLessonLanguageEventContext
+      ): SwitchInLessonLanguageEventContextSubject =
+        assertAbout(::SwitchInLessonLanguageEventContextSubject).that(actual)
+    }
+  }
+
   companion object {
     /** Returns a new [EventLogSubject] to verify aspects of the specified [EventLog] value. */
     fun assertThat(actual: EventLog): EventLogSubject = assertAbout(::EventLogSubject).that(actual)
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 098c7d5ecf3..00516da71ce 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
@@ -3,17 +3,20 @@ package org.oppia.android.util.logging
 import android.content.Context
 import android.os.Build
 import android.os.Bundle
+import org.oppia.android.app.model.AppLanguageSelection
+import org.oppia.android.app.model.AudioTranslationLanguageSelection
 import org.oppia.android.app.model.EventLog
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.ACCESS_HINT_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.ACCESS_SOLUTION_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.ACTIVITYCONTEXT_NOT_SET
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.APP_IN_BACKGROUND_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.APP_IN_FOREGROUND_CONTEXT
+import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.CLOSE_REVISION_CARD
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.DELETE_PROFILE_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.END_CARD_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.EXIT_EXPLORATION_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.FINISH_EXPLORATION_CONTEXT
-import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.HINT_OFFERED_CONTEXT
+import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.HINT_UNLOCKED_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.INSTALL_ID_FOR_FAILED_ANALYTICS_LOG
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.OPEN_CONCEPT_CARD
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.OPEN_EXPLORATION_ACTIVITY
@@ -30,10 +33,13 @@ import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.PAUSE_VO
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.PLAY_VOICE_OVER_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.REACH_INVESTED_ENGAGEMENT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.RESUME_EXPLORATION_CONTEXT
-import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.SOLUTION_OFFERED_CONTEXT
+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_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
+import org.oppia.android.app.model.EventLog.SwitchInLessonLanguageEventContext
+import org.oppia.android.app.model.OppiaLanguage
 import org.oppia.android.app.model.OppiaMetricLog
 import org.oppia.android.app.model.OppiaMetricLog.LoggableMetric.LoggableMetricTypeCase
 import org.oppia.android.app.model.OppiaMetricLog.LoggableMetric.LoggableMetricTypeCase.APK_SIZE_METRIC
@@ -44,6 +50,7 @@ import org.oppia.android.app.model.OppiaMetricLog.LoggableMetric.LoggableMetricT
 import org.oppia.android.app.model.OppiaMetricLog.LoggableMetric.LoggableMetricTypeCase.STARTUP_LATENCY_METRIC
 import org.oppia.android.app.model.OppiaMetricLog.LoggableMetric.LoggableMetricTypeCase.STORAGE_USAGE_METRIC
 import org.oppia.android.app.model.ScreenName
+import org.oppia.android.app.model.WrittenTranslationLanguageSelection
 import org.oppia.android.app.utility.getVersionCode
 import org.oppia.android.app.utility.getVersionName
 import org.oppia.android.util.logging.EventBundleCreator.EventActivityContext.CardContext
@@ -58,6 +65,7 @@ import org.oppia.android.util.logging.EventBundleCreator.EventActivityContext.Re
 import org.oppia.android.util.logging.EventBundleCreator.EventActivityContext.SensitiveStringContext
 import org.oppia.android.util.logging.EventBundleCreator.EventActivityContext.StoryContext
 import org.oppia.android.util.logging.EventBundleCreator.EventActivityContext.SubmitAnswerContext
+import org.oppia.android.util.logging.EventBundleCreator.EventActivityContext.SwitchInLessonLanguageContext
 import org.oppia.android.util.logging.EventBundleCreator.EventActivityContext.TopicContext
 import org.oppia.android.util.logging.EventBundleCreator.PerformanceMetricsLoggableMetricType.ApkSizeLoggableMetric
 import org.oppia.android.util.logging.EventBundleCreator.PerformanceMetricsLoggableMetricType.CpuUsageLoggableMetric
@@ -119,6 +127,13 @@ class EventBundleCreator @Inject constructor(
     bundle.putInt("android_sdk", androidSdkVersion)
     bundle.putString("app_version_name", appVersionName)
     bundle.putInt("app_version_code", appVersionCode)
+    bundle.putString("oppia_app_lang", eventLog.appLanguageSelection.toAnalyticsText())
+    bundle.putString(
+      "oppia_content_lang", eventLog.writtenTranslationLanguageSelection.toAnalyticsText()
+    )
+    bundle.putString(
+      "oppia_audio_lang", eventLog.audioTranslationLanguageSelection.toAnalyticsText()
+    )
     return eventLog.context.convertToActivityContext().also { eventContext ->
       // Only allow user IDs to be logged when the learner study feature is enabled.
       eventContext.storeValue(
@@ -164,11 +179,12 @@ class EventBundleCreator @Inject constructor(
       OPEN_STORY_ACTIVITY -> StoryContext(activityName, openStoryActivity)
       OPEN_CONCEPT_CARD -> ConceptCardContext(activityName, openConceptCard)
       OPEN_REVISION_CARD -> RevisionCardContext(activityName, openRevisionCard)
+      CLOSE_REVISION_CARD -> RevisionCardContext(activityName, closeRevisionCard)
       START_CARD_CONTEXT -> CardContext(activityName, startCardContext)
       END_CARD_CONTEXT -> CardContext(activityName, endCardContext)
-      HINT_OFFERED_CONTEXT -> HintContext(activityName, hintOfferedContext)
+      HINT_UNLOCKED_CONTEXT -> HintContext(activityName, hintUnlockedContext)
       ACCESS_HINT_CONTEXT -> HintContext(activityName, accessHintContext)
-      SOLUTION_OFFERED_CONTEXT -> ExplorationContext(activityName, solutionOfferedContext)
+      SOLUTION_UNLOCKED_CONTEXT -> ExplorationContext(activityName, solutionUnlockedContext)
       ACCESS_SOLUTION_CONTEXT -> ExplorationContext(activityName, accessSolutionContext)
       SUBMIT_ANSWER_CONTEXT -> SubmitAnswerContext(activityName, submitAnswerContext)
       PLAY_VOICE_OVER_CONTEXT -> PlayPauseVoiceOverContext(activityName, playVoiceOverContext)
@@ -184,6 +200,8 @@ class EventBundleCreator @Inject constructor(
       OPEN_HOME -> EmptyContext(activityName)
       OPEN_PROFILE_CHOOSER -> EmptyContext(activityName)
       REACH_INVESTED_ENGAGEMENT -> ExplorationContext(activityName, reachInvestedEngagement)
+      SWITCH_IN_LESSON_LANGUAGE ->
+        SwitchInLessonLanguageContext(activityName, switchInLessonLanguage)
       INSTALL_ID_FOR_FAILED_ANALYTICS_LOG ->
         SensitiveStringContext(activityName, installIdForFailedAnalyticsLog, "install_id")
       ACTIVITYCONTEXT_NOT_SET, null -> EmptyContext(activityName) // No context to create here.
@@ -383,6 +401,18 @@ class EventBundleCreator @Inject constructor(
       }
     }
 
+    /** The [EventActivityContext] corresponding to [SwitchInLessonLanguageEventContext]s. */
+    class SwitchInLessonLanguageContext(
+      activityName: String,
+      value: SwitchInLessonLanguageEventContext
+    ) : EventActivityContext<SwitchInLessonLanguageEventContext>(activityName, value) {
+      override fun SwitchInLessonLanguageEventContext.storeValue(store: PropertyStore) {
+        store.putProperties("exploration_details", explorationDetails, ::ExplorationContext)
+        store.putNonSensitiveValue("from_language", switchFromLanguage.toAnalyticsName())
+        store.putNonSensitiveValue("to_language", switchToLanguage.toAnalyticsName())
+      }
+    }
+
     /** The [EventActivityContext] corresponding to [QuestionEventContext]s. */
     class QuestionContext(
       activityName: String,
@@ -536,95 +566,143 @@ class EventBundleCreator @Inject constructor(
     }
   }
 
-  private fun EventLog.Priority.toAnalyticsName() = when (this) {
-    EventLog.Priority.PRIORITY_UNSPECIFIED -> "unspecified_priority"
-    EventLog.Priority.ESSENTIAL -> "essential"
-    EventLog.Priority.OPTIONAL -> "optional"
-    EventLog.Priority.UNRECOGNIZED -> "unknown_priority"
-  }
+  private companion object {
+    private fun EventLog.Priority.toAnalyticsName() = when (this) {
+      EventLog.Priority.PRIORITY_UNSPECIFIED -> "unspecified_priority"
+      EventLog.Priority.ESSENTIAL -> "essential"
+      EventLog.Priority.OPTIONAL -> "optional"
+      EventLog.Priority.UNRECOGNIZED -> "unknown_priority"
+    }
 
-  private fun OppiaMetricLog.Priority.toAnalyticsName() = when (this) {
-    OppiaMetricLog.Priority.PRIORITY_UNSPECIFIED -> "unspecified_priority"
-    OppiaMetricLog.Priority.LOW_PRIORITY -> "low_priority"
-    OppiaMetricLog.Priority.MEDIUM_PRIORITY -> "medium_priority"
-    OppiaMetricLog.Priority.HIGH_PRIORITY -> "high_priority"
-    OppiaMetricLog.Priority.UNRECOGNIZED -> "unknown_priority"
-  }
+    private fun OppiaMetricLog.Priority.toAnalyticsName() = when (this) {
+      OppiaMetricLog.Priority.PRIORITY_UNSPECIFIED -> "unspecified_priority"
+      OppiaMetricLog.Priority.LOW_PRIORITY -> "low_priority"
+      OppiaMetricLog.Priority.MEDIUM_PRIORITY -> "medium_priority"
+      OppiaMetricLog.Priority.HIGH_PRIORITY -> "high_priority"
+      OppiaMetricLog.Priority.UNRECOGNIZED -> "unknown_priority"
+    }
 
-  private fun OppiaMetricLog.MemoryTier.toAnalyticsName() = when (this) {
-    OppiaMetricLog.MemoryTier.MEMORY_TIER_UNSPECIFIED -> "unspecified_memory_tier"
-    OppiaMetricLog.MemoryTier.LOW_MEMORY_TIER -> "low_memory"
-    OppiaMetricLog.MemoryTier.MEDIUM_MEMORY_TIER -> "medium_memory"
-    OppiaMetricLog.MemoryTier.HIGH_MEMORY_TIER -> "high_memory"
-    OppiaMetricLog.MemoryTier.UNRECOGNIZED -> "unknown_memory_tier"
-  }
+    private fun OppiaMetricLog.MemoryTier.toAnalyticsName() = when (this) {
+      OppiaMetricLog.MemoryTier.MEMORY_TIER_UNSPECIFIED -> "unspecified_memory_tier"
+      OppiaMetricLog.MemoryTier.LOW_MEMORY_TIER -> "low_memory"
+      OppiaMetricLog.MemoryTier.MEDIUM_MEMORY_TIER -> "medium_memory"
+      OppiaMetricLog.MemoryTier.HIGH_MEMORY_TIER -> "high_memory"
+      OppiaMetricLog.MemoryTier.UNRECOGNIZED -> "unknown_memory_tier"
+    }
 
-  private fun OppiaMetricLog.StorageTier.toAnalyticsName() = when (this) {
-    OppiaMetricLog.StorageTier.STORAGE_TIER_UNSPECIFIED -> "unspecified_storage_tier"
-    OppiaMetricLog.StorageTier.LOW_STORAGE -> "low_storage"
-    OppiaMetricLog.StorageTier.MEDIUM_STORAGE -> "medium_storage"
-    OppiaMetricLog.StorageTier.HIGH_STORAGE -> "high_storage"
-    OppiaMetricLog.StorageTier.UNRECOGNIZED -> "unknown_storage_tier"
-  }
+    private fun OppiaMetricLog.StorageTier.toAnalyticsName() = when (this) {
+      OppiaMetricLog.StorageTier.STORAGE_TIER_UNSPECIFIED -> "unspecified_storage_tier"
+      OppiaMetricLog.StorageTier.LOW_STORAGE -> "low_storage"
+      OppiaMetricLog.StorageTier.MEDIUM_STORAGE -> "medium_storage"
+      OppiaMetricLog.StorageTier.HIGH_STORAGE -> "high_storage"
+      OppiaMetricLog.StorageTier.UNRECOGNIZED -> "unknown_storage_tier"
+    }
 
-  private fun OppiaMetricLog.NetworkType.toAnalyticsName() = when (this) {
-    OppiaMetricLog.NetworkType.NETWORK_UNSPECIFIED -> "unspecified_network_type"
-    OppiaMetricLog.NetworkType.WIFI -> "wifi"
-    OppiaMetricLog.NetworkType.CELLULAR -> "cellular"
-    OppiaMetricLog.NetworkType.NONE -> "none"
-    OppiaMetricLog.NetworkType.UNRECOGNIZED -> "unknown_network_type"
-  }
+    private fun OppiaMetricLog.NetworkType.toAnalyticsName() = when (this) {
+      OppiaMetricLog.NetworkType.NETWORK_UNSPECIFIED -> "unspecified_network_type"
+      OppiaMetricLog.NetworkType.WIFI -> "wifi"
+      OppiaMetricLog.NetworkType.CELLULAR -> "cellular"
+      OppiaMetricLog.NetworkType.NONE -> "none"
+      OppiaMetricLog.NetworkType.UNRECOGNIZED -> "unknown_network_type"
+    }
+
+    private fun ScreenName.toAnalyticsName() = when (this) {
+      ScreenName.SCREEN_NAME_UNSPECIFIED -> "screen_name_unspecified"
+      ScreenName.SPLASH_ACTIVITY -> "splash_activity"
+      ScreenName.PROFILE_CHOOSER_ACTIVITY -> "profile_chooser_activity"
+      ScreenName.ADD_PROFILE_ACTIVITY -> "add_profile_activity"
+      ScreenName.HOME_ACTIVITY -> "home_activity"
+      ScreenName.BACKGROUND_SCREEN -> "background_screen"
+      ScreenName.APP_VERSION_ACTIVITY -> "app_version_activity"
+      ScreenName.ADMINISTRATOR_CONTROLS_ACTIVITY -> "administrator_controls_activity"
+      ScreenName.PROFILE_AND_DEVICE_ID_ACTIVITY -> "profile_and_device_id_activity"
+      ScreenName.COMPLETED_STORY_LIST_ACTIVITY -> "completed_story_list_activity"
+      ScreenName.FAQ_SINGLE_ACTIVITY -> "faq_single_activity"
+      ScreenName.FAQ_LIST_ACTIVITY -> "faq_list_activity"
+      ScreenName.LICENSE_LIST_ACTIVITY -> "license_list_activity"
+      ScreenName.LICENSE_TEXT_VIEWER_ACTIVITY -> "license_text_viewer_activity"
+      ScreenName.THIRD_PARTY_DEPENDENCY_LIST_ACTIVITY -> "third_party_dependency_list_activity"
+      ScreenName.HELP_ACTIVITY -> "help_activity"
+      ScreenName.RECENTLY_PLAYED_ACTIVITY -> "recently_played_activity"
+      ScreenName.MY_DOWNLOADS_ACTIVITY -> "my_downloads_activity"
+      ScreenName.ONBOARDING_ACTIVITY -> "onboarding_activity"
+      ScreenName.ONGOING_TOPIC_LIST_ACTIVITY -> "ongoing_topic_list_activity"
+      ScreenName.AUDIO_LANGUAGE_ACTIVITY -> "audio_language_activity"
+      ScreenName.APP_LANGUAGE_ACTIVITY -> "app_language_activity"
+      ScreenName.OPTIONS_ACTIVITY -> "options_activity"
+      ScreenName.READING_TEXT_SIZE_ACTIVITY -> "reading_text_size_activity"
+      ScreenName.EXPLORATION_ACTIVITY -> "exploration_activity"
+      ScreenName.ADMIN_AUTH_ACTIVITY -> "admin_auth_activity"
+      ScreenName.PIN_PASSWORD_ACTIVITY -> "pin_password_activity"
+      ScreenName.PROFILE_PICTURE_ACTIVITY -> "profile_picture_activity"
+      ScreenName.PROFILE_PROGRESS_ACTIVITY -> "profile_progress_activity"
+      ScreenName.RESUME_LESSON_ACTIVITY -> "resume_lesson_activity"
+      ScreenName.PROFILE_EDIT_ACTIVITY -> "profile_edit_activity"
+      ScreenName.PROFILE_RESET_PIN_ACTIVITY -> "profile_reset_pin_activity"
+      ScreenName.PROFILE_RENAME_ACTIVITY -> "profile_rename_activity"
+      ScreenName.PROFILE_LIST_ACTIVITY -> "profile_list_activity"
+      ScreenName.STORY_ACTIVITY -> "story_activity"
+      ScreenName.TOPIC_ACTIVITY -> "topic_activity"
+      ScreenName.REVISION_CARD_ACTIVITY -> "revision_card_activity"
+      ScreenName.QUESTION_PLAYER_ACTIVITY -> "question_player_activity"
+      ScreenName.WALKTHROUGH_ACTIVITY -> "walkthrough_activity"
+      ScreenName.DEVELOPER_OPTIONS_ACTIVITY -> "developer_options_activity"
+      ScreenName.VIEW_EVENT_LOGS_ACTIVITY -> "view_event_logs_activity"
+      ScreenName.MARK_TOPICS_COMPLETED_ACTIVITY -> "mark_topics_completed_activity"
+      ScreenName.MATH_EXPRESSION_PARSER_ACTIVITY -> "math_expression_parser_activity"
+      ScreenName.MARK_CHAPTERS_COMPLETED_ACTIVITY -> "mark_chapters_completed_activity"
+      ScreenName.MARK_STORIES_COMPLETED_ACTIVITY -> "mark_stories_completed_activity"
+      ScreenName.FORCE_NETWORK_TYPE_ACTIVITY -> "force_network_type_activity"
+      ScreenName.ADMIN_PIN_ACTIVITY -> "admin_pin_activity"
+      ScreenName.POLICIES_ACTIVITY -> "policies_activity"
+      ScreenName.UNRECOGNIZED -> "unrecognized"
+      ScreenName.FOREGROUND_SCREEN -> "foreground_screen"
+    }
 
-  private fun ScreenName.toAnalyticsName() = when (this) {
-    ScreenName.SCREEN_NAME_UNSPECIFIED -> "screen_name_unspecified"
-    ScreenName.SPLASH_ACTIVITY -> "splash_activity"
-    ScreenName.PROFILE_CHOOSER_ACTIVITY -> "profile_chooser_activity"
-    ScreenName.ADD_PROFILE_ACTIVITY -> "add_profile_activity"
-    ScreenName.HOME_ACTIVITY -> "home_activity"
-    ScreenName.BACKGROUND_SCREEN -> "background_screen"
-    ScreenName.APP_VERSION_ACTIVITY -> "app_version_activity"
-    ScreenName.ADMINISTRATOR_CONTROLS_ACTIVITY -> "administrator_controls_activity"
-    ScreenName.PROFILE_AND_DEVICE_ID_ACTIVITY -> "profile_and_device_id_activity"
-    ScreenName.COMPLETED_STORY_LIST_ACTIVITY -> "completed_story_list_activity"
-    ScreenName.FAQ_SINGLE_ACTIVITY -> "faq_single_activity"
-    ScreenName.FAQ_LIST_ACTIVITY -> "faq_list_activity"
-    ScreenName.LICENSE_LIST_ACTIVITY -> "license_list_activity"
-    ScreenName.LICENSE_TEXT_VIEWER_ACTIVITY -> "license_text_viewer_activity"
-    ScreenName.THIRD_PARTY_DEPENDENCY_LIST_ACTIVITY -> "third_party_dependency_list_activity"
-    ScreenName.HELP_ACTIVITY -> "help_activity"
-    ScreenName.RECENTLY_PLAYED_ACTIVITY -> "recently_played_activity"
-    ScreenName.MY_DOWNLOADS_ACTIVITY -> "my_downloads_activity"
-    ScreenName.ONBOARDING_ACTIVITY -> "onboarding_activity"
-    ScreenName.ONGOING_TOPIC_LIST_ACTIVITY -> "ongoing_topic_list_activity"
-    ScreenName.AUDIO_LANGUAGE_ACTIVITY -> "audio_language_activity"
-    ScreenName.APP_LANGUAGE_ACTIVITY -> "app_language_activity"
-    ScreenName.OPTIONS_ACTIVITY -> "options_activity"
-    ScreenName.READING_TEXT_SIZE_ACTIVITY -> "reading_text_size_activity"
-    ScreenName.EXPLORATION_ACTIVITY -> "exploration_activity"
-    ScreenName.ADMIN_AUTH_ACTIVITY -> "admin_auth_activity"
-    ScreenName.PIN_PASSWORD_ACTIVITY -> "pin_password_activity"
-    ScreenName.PROFILE_PICTURE_ACTIVITY -> "profile_picture_activity"
-    ScreenName.PROFILE_PROGRESS_ACTIVITY -> "profile_progress_activity"
-    ScreenName.RESUME_LESSON_ACTIVITY -> "resume_lesson_activity"
-    ScreenName.PROFILE_EDIT_ACTIVITY -> "profile_edit_activity"
-    ScreenName.PROFILE_RESET_PIN_ACTIVITY -> "profile_reset_pin_activity"
-    ScreenName.PROFILE_RENAME_ACTIVITY -> "profile_rename_activity"
-    ScreenName.PROFILE_LIST_ACTIVITY -> "profile_list_activity"
-    ScreenName.STORY_ACTIVITY -> "story_activity"
-    ScreenName.TOPIC_ACTIVITY -> "topic_activity"
-    ScreenName.REVISION_CARD_ACTIVITY -> "revision_card_activity"
-    ScreenName.QUESTION_PLAYER_ACTIVITY -> "question_player_activity"
-    ScreenName.WALKTHROUGH_ACTIVITY -> "walkthrough_activity"
-    ScreenName.DEVELOPER_OPTIONS_ACTIVITY -> "developer_options_activity"
-    ScreenName.VIEW_EVENT_LOGS_ACTIVITY -> "view_event_logs_activity"
-    ScreenName.MARK_TOPICS_COMPLETED_ACTIVITY -> "mark_topics_completed_activity"
-    ScreenName.MATH_EXPRESSION_PARSER_ACTIVITY -> "math_expression_parser_activity"
-    ScreenName.MARK_CHAPTERS_COMPLETED_ACTIVITY -> "mark_chapters_completed_activity"
-    ScreenName.MARK_STORIES_COMPLETED_ACTIVITY -> "mark_stories_completed_activity"
-    ScreenName.FORCE_NETWORK_TYPE_ACTIVITY -> "force_network_type_activity"
-    ScreenName.ADMIN_PIN_ACTIVITY -> "admin_pin_activity"
-    ScreenName.POLICIES_ACTIVITY -> "policies_activity"
-    ScreenName.UNRECOGNIZED -> "unrecognized"
-    ScreenName.FOREGROUND_SCREEN -> "foreground_screen"
+    private fun AppLanguageSelection.toAnalyticsText(): String {
+      return when (selectionTypeCase) {
+        AppLanguageSelection.SelectionTypeCase.USE_SYSTEM_LANGUAGE_OR_APP_DEFAULT ->
+          "use_system_language_or_app_default"
+        AppLanguageSelection.SelectionTypeCase.SELECTED_LANGUAGE ->
+          selectedLanguage.toAnalyticsName()
+        AppLanguageSelection.SelectionTypeCase.SELECTIONTYPE_NOT_SET ->
+          "unset_app_language_selection"
+        null -> "invalid_app_language_selection"
+      }
+    }
+
+    private fun WrittenTranslationLanguageSelection.toAnalyticsText(): String {
+      return when (selectionTypeCase) {
+        WrittenTranslationLanguageSelection.SelectionTypeCase.USE_APP_LANGUAGE -> "use_app_language"
+        WrittenTranslationLanguageSelection.SelectionTypeCase.SELECTED_LANGUAGE ->
+          selectedLanguage.toAnalyticsName()
+        WrittenTranslationLanguageSelection.SelectionTypeCase.SELECTIONTYPE_NOT_SET ->
+          "unset_written_translation_language_selection"
+        null -> "invalid_written_translation_language_selection"
+      }
+    }
+
+    private fun AudioTranslationLanguageSelection.toAnalyticsText(): String {
+      return when (selectionTypeCase) {
+        AudioTranslationLanguageSelection.SelectionTypeCase.USE_APP_LANGUAGE -> "use_app_language"
+        AudioTranslationLanguageSelection.SelectionTypeCase.SELECTED_LANGUAGE ->
+          selectedLanguage.toAnalyticsName()
+        AudioTranslationLanguageSelection.SelectionTypeCase.SELECTIONTYPE_NOT_SET ->
+          "unset_audio_translation_language_selection"
+        null -> "invalid_audio_translation_language_selection"
+      }
+    }
+
+    private fun OppiaLanguage.toAnalyticsName() = when (this) {
+      OppiaLanguage.LANGUAGE_UNSPECIFIED -> "unspecified_language"
+      OppiaLanguage.ARABIC -> "Arabic"
+      OppiaLanguage.ENGLISH -> "English"
+      OppiaLanguage.HINDI -> "Hindi"
+      OppiaLanguage.HINGLISH -> "Hinglish"
+      OppiaLanguage.PORTUGUESE -> "Portuguese"
+      OppiaLanguage.BRAZILIAN_PORTUGUESE -> "Brazilian Portuguese"
+      OppiaLanguage.SWAHILI -> "Swahili"
+      OppiaLanguage.UNRECOGNIZED -> "unrecognized_language"
+    }
   }
 }
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 d0ccb5d228e..056621c0f4c 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
@@ -24,11 +24,12 @@ class KenyaAlphaEventTypeToHumanReadableNameConverterImpl @Inject constructor()
       ActivityContextCase.OPEN_STORY_ACTIVITY -> "open_story_activity"
       ActivityContextCase.OPEN_CONCEPT_CARD -> "open_concept_card"
       ActivityContextCase.OPEN_REVISION_CARD -> "open_revision_card"
+      ActivityContextCase.CLOSE_REVISION_CARD -> "close_revision_card"
       ActivityContextCase.START_CARD_CONTEXT -> "start_card_context"
       ActivityContextCase.END_CARD_CONTEXT -> "end_card_context"
-      ActivityContextCase.HINT_OFFERED_CONTEXT -> "hint_offered_context"
+      ActivityContextCase.HINT_UNLOCKED_CONTEXT -> "hint_offered_context"
       ActivityContextCase.ACCESS_HINT_CONTEXT -> "access_hint_context"
-      ActivityContextCase.SOLUTION_OFFERED_CONTEXT -> "solution_offered_context"
+      ActivityContextCase.SOLUTION_UNLOCKED_CONTEXT -> "solution_offered_context"
       ActivityContextCase.ACCESS_SOLUTION_CONTEXT -> "access_solution_context"
       ActivityContextCase.SUBMIT_ANSWER_CONTEXT -> "submit_answer_context"
       ActivityContextCase.PLAY_VOICE_OVER_CONTEXT -> "play_voice_over_context"
@@ -43,6 +44,7 @@ class KenyaAlphaEventTypeToHumanReadableNameConverterImpl @Inject constructor()
       ActivityContextCase.OPEN_HOME -> "open_home"
       ActivityContextCase.OPEN_PROFILE_CHOOSER -> "open_profile_chooser"
       ActivityContextCase.REACH_INVESTED_ENGAGEMENT -> "reached_invested_engagement"
+      ActivityContextCase.SWITCH_IN_LESSON_LANGUAGE -> "switch_in_lesson_language"
       ActivityContextCase.INSTALL_ID_FOR_FAILED_ANALYTICS_LOG -> "failed_analytics_log"
       ActivityContextCase.ACTIVITYCONTEXT_NOT_SET -> "unknown_activity_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 3008aa9bb76..cc687478320 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
@@ -34,11 +34,12 @@ class StandardEventTypeToHumanReadableNameConverterImpl @Inject constructor() :
       ActivityContextCase.OPEN_STORY_ACTIVITY -> "open_story_chapter_list_screen"
       ActivityContextCase.OPEN_CONCEPT_CARD -> "open_concept_card"
       ActivityContextCase.OPEN_REVISION_CARD -> "open_revision_card"
+      ActivityContextCase.CLOSE_REVISION_CARD -> "close_revision_card"
       ActivityContextCase.START_CARD_CONTEXT -> "start_exploration_card"
       ActivityContextCase.END_CARD_CONTEXT -> "end_exploration_card"
-      ActivityContextCase.HINT_OFFERED_CONTEXT -> "receive_hint_offer"
+      ActivityContextCase.HINT_UNLOCKED_CONTEXT -> "unlock_hint"
       ActivityContextCase.ACCESS_HINT_CONTEXT -> "reveal_hint"
-      ActivityContextCase.SOLUTION_OFFERED_CONTEXT -> "receive_solution_offer"
+      ActivityContextCase.SOLUTION_UNLOCKED_CONTEXT -> "unlock_solution"
       ActivityContextCase.ACCESS_SOLUTION_CONTEXT -> "reveal_solution"
       ActivityContextCase.SUBMIT_ANSWER_CONTEXT -> "submit_answer"
       ActivityContextCase.PLAY_VOICE_OVER_CONTEXT -> "click_play_voiceover_button"
@@ -53,6 +54,7 @@ class StandardEventTypeToHumanReadableNameConverterImpl @Inject constructor() :
       ActivityContextCase.OPEN_HOME -> "open_home_screen"
       ActivityContextCase.OPEN_PROFILE_CHOOSER -> "open_profile_chooser_screen"
       ActivityContextCase.REACH_INVESTED_ENGAGEMENT -> "reach_invested_engagement"
+      ActivityContextCase.SWITCH_IN_LESSON_LANGUAGE -> "click_switch_language_in_lesson"
       ActivityContextCase.INSTALL_ID_FOR_FAILED_ANALYTICS_LOG,
       ActivityContextCase.ACTIVITYCONTEXT_NOT_SET -> "ERROR_internal_logging_failure"
     }
diff --git a/utility/src/main/java/org/oppia/android/util/parser/html/BUILD.bazel b/utility/src/main/java/org/oppia/android/util/parser/html/BUILD.bazel
index c364ed223ab..47dab3398be 100644
--- a/utility/src/main/java/org/oppia/android/util/parser/html/BUILD.bazel
+++ b/utility/src/main/java/org/oppia/android/util/parser/html/BUILD.bazel
@@ -36,7 +36,6 @@ kt_android_library(
     deps = [
         ":custom_html_content_handler",
         ":list_item_leading_margin_span",
-        ":list_item_mark",
         ":policy_type",
         "//third_party:io_github_karino2_kotlitex",
         "//utility/src/main/java/org/oppia/android/util/locale:oppia_locale",
@@ -70,19 +69,6 @@ kt_android_library(
     ],
 )
 
-kt_android_library(
-    name = "list_item_mark",
-    srcs = [
-        "ListItemMark.kt",
-    ],
-    visibility = [
-        "//app:__subpackages__",
-    ],
-    deps = [
-        "//utility",
-    ],
-)
-
 kt_android_library(
     name = "custom_html_content_handler",
     srcs = [
diff --git a/utility/src/main/java/org/oppia/android/util/parser/html/CustomHtmlContentHandler.kt b/utility/src/main/java/org/oppia/android/util/parser/html/CustomHtmlContentHandler.kt
index 1cea9808956..f07310b7a9e 100644
--- a/utility/src/main/java/org/oppia/android/util/parser/html/CustomHtmlContentHandler.kt
+++ b/utility/src/main/java/org/oppia/android/util/parser/html/CustomHtmlContentHandler.kt
@@ -124,27 +124,6 @@ class CustomHtmlContentHandler private constructor(
     val openTagIndex: Int
   )
 
-  /**
-   * Handler interface for <li> tags. Subclasses set the bullet/numbered list appearance.
-   */
-  interface ListTag {
-    /**
-     * Called when an opening <li> tag is encountered.
-     *
-     * Inserts an invisible [ListItemMark] span that doesn't do any styling.
-     * Instead, [closeItem] will later find the location of this span so it knows where the opening tag was.
-     */
-    fun openItem(text: Editable)
-
-    /**
-     * Called when a closing </li> tag is encountered.
-     *
-     * Pops out the invisible [ListItemMark] span and uses it to get the opening tag location.
-     * Then, sets a [ListItemLeadingMarginSpan] from the opening tag position to closing tag position.
-     */
-    fun closeItem(text: Editable, indentation: Int)
-  }
-
   /** Handler interface for a custom tag and its attributes. */
   interface CustomTagHandler {
     /**
@@ -154,7 +133,7 @@ class CustomHtmlContentHandler private constructor(
      * @param openIndex the index in the output [Editable] at which this tag begins
      * @param closeIndex the index in the output [Editable] at which this tag ends
      * @param output the destination [Editable] to which spans can be added
-     * @param imageGetter a utility to load image drawables if needed by the handler
+     * @param imageRetriever a utility to load image drawables if needed by the handler
      */
     fun handleTag(
       attributes: Attributes,
diff --git a/utility/src/main/java/org/oppia/android/util/parser/html/LiTagHandler.kt b/utility/src/main/java/org/oppia/android/util/parser/html/LiTagHandler.kt
index c08aa2341fa..d0562b474a1 100644
--- a/utility/src/main/java/org/oppia/android/util/parser/html/LiTagHandler.kt
+++ b/utility/src/main/java/org/oppia/android/util/parser/html/LiTagHandler.kt
@@ -24,87 +24,221 @@ class LiTagHandler(
   private val context: Context,
   private val displayLocale: OppiaLocale.DisplayLocale
 ) : CustomHtmlContentHandler.CustomTagHandler {
-  private val lists = Stack<CustomHtmlContentHandler.ListTag>()
+  private val pendingLists = Stack<ListTag<*, *>>()
+  private val latestPendingList: ListTag<*, *>?
+    get() = pendingLists.lastOrNull()
 
-  override fun handleOpeningTag(
-    output: Editable,
-    tag: String
-  ) {
+  override fun handleOpeningTag(output: Editable, tag: String) {
     when (tag) {
-      CUSTOM_LIST_UL_TAG -> lists.push(Ul(context, displayLocale))
-      CUSTOM_LIST_OL_TAG -> lists.push(Ol(context, displayLocale))
-      CUSTOM_LIST_LI_TAG -> if (lists.isNotEmpty()) { lists.peek().openItem(output) }
+      CUSTOM_LIST_UL_TAG -> {
+        pendingLists += ListTag.Ul(
+          parentList = latestPendingList,
+          parentMark = latestPendingList?.pendingStartMark,
+          indentationLevel = pendingLists.size
+        )
+      }
+      CUSTOM_LIST_OL_TAG -> {
+        pendingLists += ListTag.Ol(
+          parentList = latestPendingList, parentMark = latestPendingList?.pendingStartMark
+        )
+      }
+      CUSTOM_LIST_LI_TAG -> latestPendingList?.openItem(output)
     }
   }
 
-  override fun handleClosingTag(
-    output: Editable,
-    indentation: Int,
-    tag: String
-  ) {
+  override fun handleClosingTag(output: Editable, indentation: Int, tag: String) {
     when (tag) {
-      CUSTOM_LIST_UL_TAG -> lists.pop()
-      CUSTOM_LIST_OL_TAG -> lists.pop()
-      CUSTOM_LIST_LI_TAG ->
-        if (lists.isNotEmpty()) {
-          lists.peek().closeItem(output, indentation = lists.size - 1)
-        }
+      CUSTOM_LIST_UL_TAG, CUSTOM_LIST_OL_TAG -> {
+        // Actually place the spans only if the root tree has been finished (as the entirety of the
+        // tree is needed for analysis).
+        val closingList = pendingLists.pop().also { it.recordList() }
+        if (pendingLists.isEmpty()) closingList.finishListTree(output, context, displayLocale)
+      }
+      CUSTOM_LIST_LI_TAG -> latestPendingList?.closeItem(output)
     }
   }
 
-  /** Subclass of [ListTag] for unordered lists.*/
-  private class Ul(
-    private val context: Context,
-    private val displayLocale: OppiaLocale.DisplayLocale
-  ) :
-    CustomHtmlContentHandler.ListTag {
-    override fun openItem(text: Editable) {
-      appendNewLine(text)
-      start(text, BulletListItem())
+  private sealed class ListTag<M : Mark<S>, S : ListItemLeadingMarginSpan>(
+    private val parentList: ListTag<*, *>?,
+    private val parentMark: Mark<*>?,
+    private val fetchLastMark: Editable.() -> M?
+  ) {
+    private val markRangesToReplace = mutableListOf<MarkedRange<S>>()
+    private val childrenLists = mutableMapOf<Mark<*>, ListTag<*, *>>()
+
+    /**
+     * The mark of the current item being processed for this list, if any. This is null when the
+     * most recent encountered item has been finished, or if no item has yet been encountered for
+     * this list.
+     */
+    var pendingStartMark: M? = null
+    private var itemCount = 0
+
+    /**
+     * Called when an opening <li> tag is encountered.
+     *
+     * Inserts an invisible [ListItemMark] span that doesn't do any styling.
+     * Instead, [closeItem] will later find the location of this span so it knows where the opening
+     * tag was.
+     */
+    fun openItem(text: Editable) {
+      check(pendingStartMark == null) { "Trying open new item when one is already pending." }
+      text.appendNewLine()
+      text.addMark(createMark(itemNumber = ++itemCount).also { pendingStartMark = it })
+    }
+
+    /**
+     * Called when a closing </li> tag is encountered.
+     *
+     * Pops out the invisible [ListItemMark] span and uses it to get the opening tag location.
+     * Then, sets a [ListItemLeadingMarginSpan] from the opening tag position to closing tag
+     * position.
+     */
+    fun closeItem(text: Editable) {
+      val startingMark =
+        checkNotNull(pendingStartMark) { "Cannot close item that hasn't been started." }
+      val endingMark = Mark.EndListItem()
+      text.appendNewLine()
+      text.addMark(endingMark)
+      markRangesToReplace += MarkedRange(startingMark, endingMark)
+      pendingStartMark = null
     }
 
-    override fun closeItem(text: Editable, indentation: Int) {
-      appendNewLine(text)
+    /**
+     * Records this tag as a list in this tag's parent, if it has one.
+     *
+     * A call to this function is mandatory to ensure that list hierarchies are correctly tracked
+     * for later margin calculations.
+     *
+     * Note that this does not actually change the original text (a call to [finishListTree] is
+     * needed to do that once all list & item tags have been processed and then recorded using this
+     * function).
+     */
+    fun recordList() {
+      parentMark?.let { mark -> parentList?.childrenLists?.put(mark, this) }
+    }
 
-      getLast<BulletListItem>(text)?.let { mark ->
-        setSpanFromMark(
-          text,
-          mark,
-          ListItemLeadingMarginSpan.UlSpan(context, indentation, displayLocale)
+    /**
+     * Recursively replaces all marks for this root list (and all its children) with renderable
+     * spans in the provided [text].
+     */
+    fun finishListTree(text: Editable, context: Context, displayLocale: OppiaLocale.DisplayLocale) =
+      finishListRecursively(parentSpan = null, text, context, displayLocale)
+
+    /**
+     * Returns a new mark of type [M] for this tag.
+     *
+     * @param itemNumber the number in the list that the returned mark represents
+     */
+    protected abstract fun createMark(itemNumber: Int): M
+
+    private fun finishListRecursively(
+      parentSpan: ListItemLeadingMarginSpan?,
+      text: Editable,
+      context: Context,
+      displayLocale: OppiaLocale.DisplayLocale
+    ) {
+      val childrenToProcess = childrenLists.toMutableMap()
+      markRangesToReplace.forEach { (startMark, endMark) ->
+        val styledSpan = startMark.toSpan(
+          parentSpan, context, displayLocale, peerItemCount = markRangesToReplace.size
+        )
+        text.replaceMarksWithSpan(startMark, endMark, styledSpan)
+        childrenToProcess.remove(startMark)?.finishListRecursively(
+          parentSpan = styledSpan, text, context, displayLocale
         )
       }
+
+      // Process the remaining children that are not lists themselves.
+      childrenToProcess.values.forEach {
+        it.finishListRecursively(parentSpan = null, text, context, displayLocale)
+      }
+    }
+
+    /** [ListTag] for unordered lists. */
+    class Ul(
+      parentList: ListTag<*, *>?,
+      parentMark: Mark<*>?,
+      private val indentationLevel: Int
+    ) : ListTag<Mark.BulletListItem, ListItemLeadingMarginSpan.UlSpan>(
+      parentList, parentMark, ::getLast
+    ) {
+      override fun createMark(itemNumber: Int) = Mark.BulletListItem(indentationLevel)
+    }
+
+    /** [ListTag] for ordered lists. */
+    class Ol(
+      parentList: ListTag<*, *>?,
+      parentMark: Mark<*>?
+    ) : ListTag<Mark.NumberListItem, ListItemLeadingMarginSpan.OlSpan>(
+      parentList, parentMark, ::getLast
+    ) {
+      override fun createMark(itemNumber: Int) = Mark.NumberListItem(itemNumber)
     }
   }
 
-  /** Subclass of [ListTag] for ordered lists.*/
-  private class Ol(
-    private val context: Context,
-    private val displayLocale: OppiaLocale.DisplayLocale
-  ) : CustomHtmlContentHandler.ListTag {
+  private data class MarkedRange<S : ListItemLeadingMarginSpan>(
+    val startMark: Mark<S>,
+    val endMark: Mark.EndListItem
+  )
+
+  private sealed class Mark<S : ListItemLeadingMarginSpan> {
+    /** Returns a span representation of type [S] of this mark (for eventual rendering). */
+    abstract fun toSpan(
+      parentSpan: ListItemLeadingMarginSpan?,
+      context: Context,
+      displayLocale: OppiaLocale.DisplayLocale,
+      peerItemCount: Int
+    ): S
 
-    private var index = 1
+    /** Marks the opening tag location of a list item inside an <ul> element. */
+    class BulletListItem(
+      private val indentationLevel: Int
+    ) : Mark<ListItemLeadingMarginSpan.UlSpan>() {
+      override fun equals(other: Any?) = this === other
+      override fun hashCode() = System.identityHashCode(this)
 
-    override fun openItem(text: Editable) {
-      appendNewLine(text)
-      start(text, NumberListItem(index))
-      index++
+      override fun toSpan(
+        parentSpan: ListItemLeadingMarginSpan?,
+        context: Context,
+        displayLocale: OppiaLocale.DisplayLocale,
+        peerItemCount: Int
+      ) = ListItemLeadingMarginSpan.UlSpan(parentSpan, context, indentationLevel, displayLocale)
     }
 
-    override fun closeItem(text: Editable, indentation: Int) {
-      appendNewLine(text)
-
-      getLast<NumberListItem>(text)?.let { mark ->
-        setSpanFromMark(
-          text, mark,
-          ListItemLeadingMarginSpan.OlSpan(
-            context,
-            indentation,
-            "${displayLocale.toHumanReadableString(mark.number)}.",
-            displayLocale
-          )
+    /** Marks the opening tag location of a list item inside an <ol> element. */
+    class NumberListItem(val number: Int) : Mark<ListItemLeadingMarginSpan.OlSpan>() {
+      override fun equals(other: Any?) = this === other
+      override fun hashCode() = System.identityHashCode(this)
+
+      override fun toSpan(
+        parentSpan: ListItemLeadingMarginSpan?,
+        context: Context,
+        displayLocale: OppiaLocale.DisplayLocale,
+        peerItemCount: Int
+      ): ListItemLeadingMarginSpan.OlSpan {
+        return ListItemLeadingMarginSpan.OlSpan(
+          parentSpan,
+          context,
+          numberedItemPrefix = "${displayLocale.toHumanReadableString(number)}.",
+          longestNumberedItemPrefix = "${displayLocale.toHumanReadableString(peerItemCount)}.",
+          displayLocale
         )
       }
     }
+
+    /** A [Mark] that indicates the end of a list item in a developing spannable. */
+    class EndListItem : Mark<ListItemLeadingMarginSpan>() {
+      override fun equals(other: Any?) = this === other
+      override fun hashCode() = System.identityHashCode(this)
+
+      override fun toSpan(
+        parentSpan: ListItemLeadingMarginSpan?,
+        context: Context,
+        displayLocale: OppiaLocale.DisplayLocale,
+        peerItemCount: Int
+      ) = error("Ending marks cannot be converted to spans.")
+    }
   }
 
   /**
@@ -112,54 +246,49 @@ class LiTagHandler(
    * https://android.googlesource.com/platform/frameworks/base/+/master/core/java/android/text/Html.java
    */
   companion object {
-
     /**
-     * Appends a new line to [text] if it doesn't already end in a new line.
+     * Appends a new line to [this] if it doesn't already end in a new line.
      * We want the first line of list item to start on a separate line, and other content that comes
      * after the list to also be on a separate line. We avoid appending multiple newline characters
      * in a row by first checking if the last character in output is \n.
      * https://medium.com/swlh/making-nested-lists-with-android-spannables-in-kotlin-4ad00052912c
      */
-    private fun appendNewLine(text: Editable) {
-      if (text.isNotEmpty() && text.last() != '\n') {
-        text.append("\n")
-      }
+    private fun Editable.appendNewLine() {
+      if (isNotEmpty() && last() != '\n') append("\n")
     }
 
     /**
      * Returns the most recently added span of type [T] in [text].
      *
      * Invisible marking spans are inserted to record the location of opening HTML tags in the text.
-     * We do this rather than using a stack in case text is inserted and the relative location shifts around.
+     * We do this rather than using a stack in case text is inserted and the relative location
+     * shifts around.
      *
      * The last span corresponds to the top of the "stack".
      */
-    private inline fun <reified T : ListItemMark> getLast(text: Spanned) =
+    private inline fun <reified T> getLast(text: Spanned) =
       text.getSpans(0, text.length, T::class.java).lastOrNull()
 
-    /**
-     * Pops out the invisible [listItemMark] span and uses it to get the opening tag location.
-     * Then, sets a span from the opening tag position to closing tag position.
-     */
-    private fun setSpanFromMark(text: Spannable, listItemMark: ListItemMark, styleSpan: Any) {
-      // Find the location where the mark is inserted in the string.
-      val markerLocation = text.getSpanStart(listItemMark)
-      // Remove the mark now that the location is saved
-      text.removeSpan(listItemMark)
-
-      val end = text.length
-      if (markerLocation != end) {
-        text.setSpan(styleSpan, markerLocation, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+    /** Replaces the provided [startMark] from the [this] with the [styleSpan] span. */
+    private fun <T : Mark<S>, S : ListItemLeadingMarginSpan> Spannable.replaceMarksWithSpan(
+      startMark: T,
+      endMark: Mark.EndListItem,
+      styleSpan: S
+    ) {
+      // Find the range denoted by marks, remove the mark, then add the span to the same locations.
+      val startMarkLocation = getSpanStart(startMark).also { removeSpan(startMark) }
+      val endMarkLocation = getSpanEnd(endMark).also { removeSpan(endMark) }
+      val validMarkRange = 0..length
+      if (startMarkLocation in validMarkRange && endMarkLocation in validMarkRange) {
+        setSpan(styleSpan, startMarkLocation, endMarkLocation, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
       }
     }
 
     /**
-     * Inserts an invisible [listItemMark] span that doesn't do any styling.
-     * Instead, [setSpanFromMark] will later find the location of this span so it knows where the opening tag was.
+     * Inserts an invisible [Mark] that doesn't do any styling. Instead, [replaceMarksWithSpan] will
+     * later find the location of this span so it knows where the opening tag was.
      */
-    private fun start(text: Spannable, listItemMark: ListItemMark) {
-      val currentPosition = text.length
-      text.setSpan(listItemMark, currentPosition, currentPosition, Spanned.SPAN_MARK_MARK)
-    }
+    private fun <T : Mark<*>> Spannable.addMark(mark: T) =
+      setSpan(mark, length, length, Spanned.SPAN_MARK_MARK)
   }
 }
diff --git a/utility/src/main/java/org/oppia/android/util/parser/html/ListItemLeadingMarginSpan.kt b/utility/src/main/java/org/oppia/android/util/parser/html/ListItemLeadingMarginSpan.kt
index 1fa6f11613e..36bce0e79df 100644
--- a/utility/src/main/java/org/oppia/android/util/parser/html/ListItemLeadingMarginSpan.kt
+++ b/utility/src/main/java/org/oppia/android/util/parser/html/ListItemLeadingMarginSpan.kt
@@ -3,12 +3,15 @@ package org.oppia.android.util.parser.html
 import android.content.Context
 import android.graphics.Canvas
 import android.graphics.Paint
+import android.graphics.Rect
+import android.graphics.RectF
 import android.text.Layout
 import android.text.Spanned
 import android.text.style.LeadingMarginSpan
 import androidx.core.view.ViewCompat
 import org.oppia.android.util.R
 import org.oppia.android.util.locale.OppiaLocale
+import kotlin.math.max
 
 // TODO(#562): Add screenshot tests to check whether the drawing logic works correctly on all devices.
 
@@ -17,29 +20,32 @@ import org.oppia.android.util.locale.OppiaLocale
  * Reference: https://medium.com/swlh/making-nested-lists-with-android-spannables-in-kotlin-4ad00052912c
  */
 sealed class ListItemLeadingMarginSpan : LeadingMarginSpan {
+  /** The parent list of this span, or null if it doesn't have one (that is, it's a root list). */
+  protected abstract val parent: ListItemLeadingMarginSpan?
 
-  /**
-   * A subclass of [LeadingMarginSpan] that shows nested list span for <ul> tags.
-   *
-   * @param context the activity context.
-   * @param indentation The zero-based indentation level of this item
-   */
+  private val absoluteLeadingMargin: Int
+    get() = parentAbsoluteLeadingMargin + getLeadingMargin(/* first= */ true)
+
+  /** The leading margin of all parents of this span, up to the start of the text area. */
+  protected val parentAbsoluteLeadingMargin: Int
+    get() = parent?.absoluteLeadingMargin ?: 0
+
+  /** A subclass of [LeadingMarginSpan] that shows nested list span for <ul> tags. */
   class UlSpan(
+    override val parent: ListItemLeadingMarginSpan?,
     context: Context,
-    private val indentation: Int,
+    private val indentationLevel: Int,
     private val displayLocale: OppiaLocale.DisplayLocale,
-  ) : LeadingMarginSpan {
+  ) : ListItemLeadingMarginSpan() {
     private val resources = context.resources
     private val bulletRadius = resources.getDimensionPixelSize(R.dimen.bullet_radius)
-    private val gapWidth = resources.getDimensionPixelSize(R.dimen.bullet_gap_width)
-
-    /** The space between the start of the line and the bullet. */
-    private val spacingBeforeBullet =
-      resources.getDimensionPixelSize(R.dimen.spacing_before_bullet)
+    private val spacingBeforeText = resources.getDimensionPixelSize(R.dimen.spacing_before_text)
+    private val spacingBeforeBullet = resources.getDimensionPixelSize(R.dimen.spacing_before_bullet)
 
-    /** The space between the bullet and the text. */
-    private val spacingBeforeText =
-      resources.getDimensionPixelSize(R.dimen.spacing_before_text)
+    private val bulletDiameter by lazy { bulletRadius * 2 }
+    private val isRtl by lazy {
+      displayLocale.getLayoutDirection() == ViewCompat.LAYOUT_DIRECTION_RTL
+    }
 
     override fun drawLeadingMargin(
       canvas: Canvas,
@@ -59,52 +65,68 @@ sealed class ListItemLeadingMarginSpan : LeadingMarginSpan {
       val isFirstCharacter = startCharOfSpan == start
 
       if (isFirstCharacter) {
-        val trueX = gapWidth * indentation + spacingBeforeBullet
-
-        val yPosition = (top + bottom) / 2f
-        val style = paint.style
-        if (indentation == 0) {
-          paint.style = Paint.Style.FILL
-        } else {
-          paint.style = Paint.Style.STROKE
-          paint.strokeWidth = 2f
+        val previousStyle = paint.style
+        val bulletDrawRadius = bulletRadius.toFloat()
+
+        val indentedX = parentAbsoluteLeadingMargin + spacingBeforeBullet
+        val bulletStartX = (if (isRtl) canvas.width - indentedX - 1 else indentedX).toFloat()
+        val bulletCenterX = bulletStartX + bulletDrawRadius
+        val bulletCenterY = (top + bottom) / 2f
+        when (indentationLevel) {
+          0 -> {
+            // A solid circle is used for the outermost bullet.
+            paint.style = Paint.Style.FILL
+            canvas.drawCircle(bulletCenterX, bulletCenterY, bulletDrawRadius, paint)
+          }
+          1 -> {
+            // An inner open circle is used for second-level bullets.
+            paint.style = Paint.Style.STROKE
+            paint.strokeWidth = 2f
+            canvas.drawCircle(bulletCenterX, bulletCenterY, bulletDrawRadius, paint)
+          }
+          else -> {
+            // A filled square is used for all subsequent bullets.
+            paint.style = Paint.Style.FILL
+            val rectSize = bulletDiameter.toFloat()
+            canvas.drawRect(
+              RectF().apply {
+                left = bulletStartX
+                right = left + rectSize
+                this.top = bulletCenterY - bulletDrawRadius
+                this.bottom = this.top + rectSize
+              },
+              paint
+            )
+          }
         }
-        val correctX = if (isRtl) canvas.width - trueX - 1 else trueX
-        canvas.drawCircle(correctX.toFloat(), yPosition, bulletRadius.toFloat(), paint)
-        paint.style = style
+        paint.style = previousStyle // Restore the previously used paint style.
       }
     }
 
-    override fun getLeadingMargin(first: Boolean): Int {
-      return 2 * bulletRadius + spacingBeforeText
-    }
-
-    private val isRtl by lazy {
-      displayLocale.getLayoutDirection() == ViewCompat.LAYOUT_DIRECTION_RTL
-    }
+    override fun getLeadingMargin(first: Boolean) =
+      bulletDiameter + spacingBeforeBullet + spacingBeforeText
   }
 
-  /**
-   * A subclass of [LeadingMarginSpan] that shows nested list span for <ol> tags.
-   *
-   * @param context the activity context.
-   * @param indentation The zero-based indentation level of this item
-   */
+  /** A subclass of [LeadingMarginSpan] that shows nested list span for <ol> tags. */
   class OlSpan(
+    override val parent: ListItemLeadingMarginSpan?,
     context: Context,
-    private val indentation: Int,
     private val numberedItemPrefix: String,
+    private val longestNumberedItemPrefix: String,
     private val displayLocale: OppiaLocale.DisplayLocale
-  ) : LeadingMarginSpan {
+  ) : ListItemLeadingMarginSpan() {
     private val resources = context.resources
-    private val gapWidth = resources.getDimensionPixelSize(R.dimen.bullet_gap_width)
+    private val spacingBeforeText = resources.getDimensionPixelSize(R.dimen.spacing_before_text)
+    private val spacingBeforeNumberPrefix =
+      resources.getDimensionPixelSize(R.dimen.spacing_before_number_prefix)
 
-    /** The space between the start of the line and the bullet. */
-    private val spacingBeforeBullet =
-      resources.getDimensionPixelSize(R.dimen.spacing_before_bullet)
+    // Try to use a computed margin, but otherwise guess if there's no guaranteed spacing.
+    private var computedLeadingMargin =
+      2 * longestNumberedItemPrefix.length + spacingBeforeText
 
-    private val spacingBeforeNumberedText =
-      resources.getDimensionPixelSize(R.dimen.spacing_before_numbered_text)
+    private val isRtl by lazy {
+      displayLocale.getLayoutDirection() == ViewCompat.LAYOUT_DIRECTION_RTL
+    }
 
     override fun drawLeadingMargin(
       canvas: Canvas,
@@ -124,18 +146,30 @@ sealed class ListItemLeadingMarginSpan : LeadingMarginSpan {
       val isFirstCharacter = startCharOfSpan == start
 
       if (isFirstCharacter) {
-        val trueX = gapWidth * indentation + spacingBeforeBullet
-        val correctX = if (isRtl) canvas.width - trueX - spacingBeforeBullet else trueX
-        canvas.drawText(numberedItemPrefix, correctX.toFloat(), baseline.toFloat(), paint)
+        val textWidth = Rect().also {
+          paint.getTextBounds(
+            numberedItemPrefix, /* start= */ 0, /* end= */ numberedItemPrefix.length, it
+          )
+        }.width()
+        val longestTextWidth = Rect().also {
+          paint.getTextBounds(
+            longestNumberedItemPrefix,
+            /* start= */ 0,
+            /* end= */ longestNumberedItemPrefix.length,
+            it
+          )
+        }.width()
+        computedLeadingMargin = longestTextWidth + spacingBeforeNumberPrefix + spacingBeforeText
+
+        // Compute the prefix's start x value such that it is right-aligned with other numbers in
+        // the list.
+        val indentedX = parentAbsoluteLeadingMargin + spacingBeforeNumberPrefix
+        val endAlignedX = (max(textWidth, longestTextWidth) - textWidth) + indentedX
+        val prefixStartX = if (isRtl) canvas.width - endAlignedX - 1 else endAlignedX
+        canvas.drawText(numberedItemPrefix, prefixStartX.toFloat(), baseline.toFloat(), paint)
       }
     }
 
-    override fun getLeadingMargin(first: Boolean): Int {
-      return 2 * numberedItemPrefix.length + spacingBeforeNumberedText
-    }
-
-    private val isRtl by lazy {
-      displayLocale.getLayoutDirection() == ViewCompat.LAYOUT_DIRECTION_RTL
-    }
+    override fun getLeadingMargin(first: Boolean) = computedLeadingMargin
   }
 }
diff --git a/utility/src/main/java/org/oppia/android/util/parser/html/ListItemMark.kt b/utility/src/main/java/org/oppia/android/util/parser/html/ListItemMark.kt
deleted file mode 100644
index b89044393d1..00000000000
--- a/utility/src/main/java/org/oppia/android/util/parser/html/ListItemMark.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.oppia.android.util.parser.html
-
-/** Interface for invisible spans that aren't used for styling. */
-sealed class ListItemMark
-
-/** Marks the opening tag location of a list item inside an <ul> element. */
-class BulletListItem : ListItemMark()
-
-/** Marks the opening tag location of a list item inside an <ol> element. */
-class NumberListItem(val number: Int) : ListItemMark()
diff --git a/utility/src/main/java/org/oppia/android/util/parser/image/UrlImageParser.kt b/utility/src/main/java/org/oppia/android/util/parser/image/UrlImageParser.kt
index 89a819763b6..9b6cc8311e9 100644
--- a/utility/src/main/java/org/oppia/android/util/parser/image/UrlImageParser.kt
+++ b/utility/src/main/java/org/oppia/android/util/parser/image/UrlImageParser.kt
@@ -9,6 +9,7 @@ import android.graphics.Rect
 import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
 import android.text.Html
+import android.util.DisplayMetrics
 import android.util.TypedValue
 import android.view.View
 import android.view.ViewGroup
@@ -25,9 +26,27 @@ import org.oppia.android.util.parser.html.CustomHtmlContentHandler.ImageRetrieve
 import org.oppia.android.util.parser.svg.BlockPictureDrawable
 import javax.inject.Inject
 import kotlin.math.max
+import kotlin.math.sqrt
 
 // TODO(#169): Replace this with exploration asset downloader.
 
+/**
+ * The pixels-per-inch used on @seanlip's monitor with which Oppia content images have been
+ * calibrated to be the correct scale.
+ *
+ * This measurement is used to convert image sizes such that they have the same physical display
+ * size when rendered on a local Android device.
+ */
+private const val REFERENCE_MONITOR_PPI = 81.589f
+
+/**
+ * A factor to adjust for the fact that phones are physically smaller than the display used to
+ * calibrate [REFERENCE_MONITOR_PPI] by downsizing the images to be more appropriately sized.
+ *
+ * Image sizes will still be consistent with the original calibration display.
+ */
+private const val RELATIVE_SIZE_ADJUSTMENT_FACTOR = 0.15f
+
 /** UrlImage Parser for android TextView to load Html Image tag. */
 class UrlImageParser private constructor(
   private val context: Context,
@@ -42,6 +61,15 @@ class UrlImageParser private constructor(
   private val consoleLogger: ConsoleLogger,
   private val machineLocale: OppiaLocale.MachineLocale
 ) : Html.ImageGetter, ImageRetriever {
+  private val diagonalPixelsPerInch by lazy {
+    context.resources.displayMetrics.computeDiagonalPpi()
+  }
+  private val oppiaLocalImageSpaceConversionFactor by lazy {
+    // The conversion here is from Oppia pixel to MDPI pixel (which can be treated as dp since
+    // 1px=1dp in MDPI) for later scaling according to the user's set display density.
+    (diagonalPixelsPerInch / REFERENCE_MONITOR_PPI) * RELATIVE_SIZE_ADJUSTMENT_FACTOR
+  }
+
   override fun getDrawable(urlString: String): Drawable {
     // Only block images can be loaded through the standard ImageGetter.
     return loadDrawable(urlString, BLOCK_IMAGE)
@@ -125,7 +153,11 @@ class UrlImageParser private constructor(
     createTarget: (AutoAdjustingImageTarget.TargetConfiguration) -> C
   ): CustomImageTarget<T> {
     val configuration = AutoAdjustingImageTarget.TargetConfiguration(
-      context, htmlContentTextView, imageCenterAlign, proxyDrawable
+      context,
+      htmlContentTextView,
+      imageCenterAlign,
+      proxyDrawable,
+      oppiaLocalImageSpaceConversionFactor
     )
     return CustomImageTarget(createTarget(configuration))
   }
@@ -144,6 +176,9 @@ class UrlImageParser private constructor(
     protected val htmlContentTextView by lazy { targetConfiguration.htmlContentTextView }
     protected val imageCenterAlign by lazy { targetConfiguration.imageCenterAlign }
     protected val proxyDrawable by lazy { targetConfiguration.proxyDrawable }
+    private val oppiaLocalImageSpaceConversionFactor by lazy {
+      targetConfiguration.oppiaLocalImageSpaceConversionFactor
+    }
 
     override fun onLoadCleared(placeholder: Drawable?) {
       // No resources to clear.
@@ -181,6 +216,13 @@ class UrlImageParser private constructor(
       padding: Rect
     ): Rect
 
+    /**
+     * Returns a conversion of [this] from "Oppia" image space to local Android screen space (to
+     * ensure images take up the same physical space locally as they do on @seanlip's monitor).
+     */
+    protected fun Float.oppiaPxToLocalAndroidPx() =
+      context.dpToPx(this * oppiaLocalImageSpaceConversionFactor)
+
     /**
      * A [AutoAdjustingImageTarget] that may automatically center and/or resize loaded images to
      * display them in a "block" fashion.
@@ -221,8 +263,8 @@ class UrlImageParser private constructor(
         if (autoResizeImage) {
           // Treat the drawable's dimensions as dp so that the image scales for higher density
           // displays.
-          drawableWidth = context.dpToPx(drawable.intrinsicWidth)
-          drawableHeight = context.dpToPx(drawable.intrinsicHeight)
+          drawableWidth = drawableWidth.oppiaPxToLocalAndroidPx()
+          drawableHeight = drawableHeight.oppiaPxToLocalAndroidPx()
 
           val minimumImageSize = context.resources.getDimensionPixelSize(R.dimen.minimum_image_size)
           if (drawableHeight <= minimumImageSize || drawableWidth <= minimumImageSize) {
@@ -360,16 +402,21 @@ class UrlImageParser private constructor(
     /**
      * Configures a [AutoAdjustingImageTarget]. See the specified parameters for what needs to be
      * provided.
+     *
+     * @property context the application context
+     * @property htmlContentTextView the [TextView] in which the retrieved images are being rendered
+     * @property imageCenterAlign whether to automatically align block-displayed images
+     * @property proxyDrawable the [ProxyDrawable] corresponding to the drawable that will be loaded
+     *     for displaying
+     * @property oppiaLocalImageSpaceConversionFactor the conversion factor from Oppia image space
+     *     pixels into the local Android device's screen space dp
      */
     data class TargetConfiguration(
-      /** The application context. */
       val context: Context,
-      /** The [TextView] in which the retrieved images are being rendered. */
       val htmlContentTextView: TextView,
-      /** Whether to automatically align block-displayed images. */
       val imageCenterAlign: Boolean,
-      /** The [ProxyDrawable] corresponding to the drawable that will be loaded for displaying. */
-      val proxyDrawable: ProxyDrawable
+      val proxyDrawable: ProxyDrawable,
+      val oppiaLocalImageSpaceConversionFactor: Float
     )
   }
 
@@ -479,5 +526,7 @@ private fun TextView.width(computeWidthOnGlobalLayout: (Int) -> Unit) {
   }
 }
 
-private fun Context.dpToPx(dp: Int): Float =
-  TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp.toFloat(), resources.displayMetrics)
+private fun Context.dpToPx(dp: Float): Float =
+  TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, resources.displayMetrics)
+
+private fun DisplayMetrics.computeDiagonalPpi() = sqrt(xdpi * xdpi + ydpi * ydpi)
diff --git a/utility/src/main/java/org/oppia/android/util/parser/svg/ScalableVectorGraphic.kt b/utility/src/main/java/org/oppia/android/util/parser/svg/ScalableVectorGraphic.kt
index 0a16d09176e..06dc224ad89 100644
--- a/utility/src/main/java/org/oppia/android/util/parser/svg/ScalableVectorGraphic.kt
+++ b/utility/src/main/java/org/oppia/android/util/parser/svg/ScalableVectorGraphic.kt
@@ -65,11 +65,18 @@ class ScalableVectorGraphic {
     // size the image should be rendered at one web rather than its actual size), but it's a
     // reasonable fallback if the other two are unavailable. If no dimension is available, default
     // to a value that can hopefully be scaled (though it's likely at that point the image will not
-    // render well).
-    val width = documentWidth ?: viewBoxWidth ?: imageFileNameWidth ?: DEFAULT_SIZE_PX
-    val height = documentHeight ?: viewBoxHeight ?: imageFileNameHeight ?: DEFAULT_SIZE_PX
-
-    return SvgSizeSpecs(width, height, verticalAlignment)
+    // render well). However, the filename is the best indicator of what size to which the image
+    // *should* be rendered.
+    val intrinsicWidth = documentWidth ?: viewBoxWidth ?: imageFileNameWidth ?: DEFAULT_SIZE_PX
+    val intrinsicHeight = documentHeight ?: viewBoxHeight ?: imageFileNameHeight ?: DEFAULT_SIZE_PX
+
+    return SvgSizeSpecs(
+      intrinsicWidth,
+      intrinsicHeight,
+      renderedWidth = imageFileNameWidth ?: intrinsicWidth,
+      renderedHeight = imageFileNameHeight ?: intrinsicHeight,
+      verticalAlignment
+    )
   }
 
   /**
@@ -115,13 +122,21 @@ class ScalableVectorGraphic {
   // in the future.
   private fun adjustAlignmentForAndroid(value: Float) = value * -0.5f
 
-  /** Corresponds to the intrinsic size of the drawable. */
+  /**
+   * Corresponds to the intrinsic size of the drawable.
+   *
+   * @property intrinsicWidth the width in pixels needed to contain the entire SVG picture
+   * @property intrinsicHeight the height in pixels needed to contain the entire SVG picture
+   * @property renderedWidth the desired width to render the SVG, in Oppia web pixels
+   * @property renderedHeight the desired height to render the SVG, in Oppia web pixels
+   * @property verticalAlignment he amount of vertical pixels that should be translated when drawing
+   *     the picture
+   */
   data class SvgSizeSpecs(
-    /** The width in pixels needed to contain the entire SVG picture. */
-    val width: Float,
-    /** The height in pixels needed to contain the entire SVG picture. */
-    val height: Float,
-    /** The amount of vertical pixels that should be translated when drawing the picture. */
+    val intrinsicWidth: Float,
+    val intrinsicHeight: Float,
+    val renderedWidth: Float = intrinsicWidth,
+    val renderedHeight: Float = intrinsicHeight,
     val verticalAlignment: Float = 0f
   )
 
diff --git a/utility/src/main/java/org/oppia/android/util/parser/svg/SvgPictureDrawable.kt b/utility/src/main/java/org/oppia/android/util/parser/svg/SvgPictureDrawable.kt
index c74a5fdc249..8178e745dca 100644
--- a/utility/src/main/java/org/oppia/android/util/parser/svg/SvgPictureDrawable.kt
+++ b/utility/src/main/java/org/oppia/android/util/parser/svg/SvgPictureDrawable.kt
@@ -35,7 +35,8 @@ abstract class SvgPictureDrawable(
   private val bitmapBlurrer by lazy { BitmapBlurrer(context) }
 
   private var picture: Picture? = null
-  private var intrinsicSize = ScalableVectorGraphic.SvgSizeSpecs(width = -1f, height = -1f)
+  private var intrinsicSize =
+    ScalableVectorGraphic.SvgSizeSpecs(intrinsicWidth = -1f, intrinsicHeight = -1f)
   private var bitmap: Bitmap? = null
 
   override fun draw(canvas: Canvas) {
@@ -66,7 +67,7 @@ abstract class SvgPictureDrawable(
           val scaleX = bounds.width().toFloat() / intrinsicWidth
           val scaleY = bounds.height().toFloat() / intrinsicHeight
           scale(scaleX, scaleY)
-          drawPicture(picture)
+          drawPicture(picture, /* dst= */ intrinsicSize.computeRenderingBounds())
         }
       }
 
@@ -76,13 +77,17 @@ abstract class SvgPictureDrawable(
   }
 
   /**
-   * See the super class for specifics. Note that the returned width will not be valid until this
-   * drawable is initialized (which is the responsibility of the subclass implementation).
+   * See the super class for specifics.
+   *
+   * Note that the returned width will not be valid until this drawable is initialized (which is the
+   * responsibility of the subclass implementation). Note also that implementations are allowed to
+   * render the drawable at a different scale from the image itself (to ensure it's both rendered
+   * and finally sized correctly, in parity with Oppia web).
    */
-  override fun getIntrinsicWidth(): Int = intrinsicSize.width.toInt()
+  override fun getIntrinsicWidth(): Int = intrinsicSize.renderedWidth.toInt()
 
   /** See [getIntrinsicWidth]. */
-  override fun getIntrinsicHeight(): Int = intrinsicSize.height.toInt()
+  override fun getIntrinsicHeight(): Int = intrinsicSize.renderedHeight.toInt()
 
   override fun setAlpha(alpha: Int) { /* Unsupported. */ }
 
@@ -109,7 +114,7 @@ abstract class SvgPictureDrawable(
     bitmap = picture?.let { picture ->
       val renderedPictureBitmap = Bitmap.createBitmap(intrinsicWidth, intrinsicHeight, ARGB_8888)
       val canvas = Canvas(renderedPictureBitmap)
-      canvas.drawPicture(picture)
+      canvas.drawPicture(picture, /* dst= */ intrinsicSize.computeRenderingBounds())
       return@let transformBitmap(renderedPictureBitmap)
     }
   }
@@ -127,15 +132,26 @@ abstract class SvgPictureDrawable(
       ImageTransformation.BLUR -> bitmapBlurrer.blur(bitmap)
     }
   }
-}
 
-private fun ScalableVectorGraphic.shouldBeRenderedAsBitmap() =
-  hasTransformations() || isUsingAndroidSdkWithSvgRenderingIssues()
+  private companion object {
+    private fun ScalableVectorGraphic.SvgSizeSpecs.computeRenderingBounds(): Rect {
+      return Rect().apply {
+        left = 0
+        right = renderedWidth.toInt()
+        top = 0
+        bottom = renderedHeight.toInt()
+      }
+    }
+
+    private fun ScalableVectorGraphic.shouldBeRenderedAsBitmap() =
+      hasTransformations() || isUsingAndroidSdkWithSvgRenderingIssues()
 
-private fun ScalableVectorGraphic.hasTransformations() = transformations.isNotEmpty()
+    private fun ScalableVectorGraphic.hasTransformations() = transformations.isNotEmpty()
 
-// TODO(#3961): Remove this & instead rely on native SVG rendering for older SDK versions.
-// See #3938 for context on why these OS versions are being forced to bitmap rendering.
-@SuppressLint("ObsoleteSdkInt") // Incorrect warning.
-private fun isUsingAndroidSdkWithSvgRenderingIssues() =
-  Build.VERSION.SDK_INT <= Build.VERSION_CODES.M
+    // TODO(#3961): Remove this & instead rely on native SVG rendering for older SDK versions.
+    // See #3938 for context on why these OS versions are being forced to bitmap rendering.
+    @SuppressLint("ObsoleteSdkInt") // Incorrect warning.
+    private fun isUsingAndroidSdkWithSvgRenderingIssues() =
+      Build.VERSION.SDK_INT <= Build.VERSION_CODES.M
+  }
+}
diff --git a/utility/src/main/res/values/dimens.xml b/utility/src/main/res/values/dimens.xml
index 6a3802169a7..0895591a13b 100644
--- a/utility/src/main/res/values/dimens.xml
+++ b/utility/src/main/res/values/dimens.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <dimen name="bullet_radius">4dp</dimen>
-  <dimen name="bullet_gap_width">16dp</dimen>
+  <!-- While 3dp isn't a standard material size, it seems to be the best size to use for bullets (so that they're not too small/large). -->
+  <dimen name="bullet_radius">3sp</dimen>
   <dimen name="bullet_y_offset">2dp</dimen>
   <!-- Space between the start of the line and the bullet in a bullet span. -->
   <dimen name="spacing_before_bullet">8dp</dimen>
-  <!-- Space between bullet and the text in a bullet span. -->
-  <dimen name="spacing_before_text">24dp</dimen>
-  <dimen name="spacing_before_numbered_text">28dp</dimen>
+  <!-- Space between the start of the line and the number in a numbered span. -->
+  <dimen name="spacing_before_number_prefix">8dp</dimen>
+  <!-- Space between the end of a bullet/number prefix and the text that follows it. -->
+  <dimen name="spacing_before_text">8dp</dimen>
   <dimen name="maximum_content_item_padding">24dp</dimen>
   <dimen name="minimum_image_size">48dp</dimen>
   <dimen name="maximum_image_size">200dp</dimen>
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 5e5e05d85dd..db170978df5 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
@@ -15,6 +15,8 @@ import dagger.Provides
 import org.junit.After
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.oppia.android.app.model.AppLanguageSelection
+import org.oppia.android.app.model.AudioTranslationLanguageSelection
 import org.oppia.android.app.model.EventLog
 import org.oppia.android.app.model.EventLog.CardContext
 import org.oppia.android.app.model.EventLog.ConceptCardContext
@@ -23,11 +25,12 @@ import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.ACCESS_S
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.ACTIVITYCONTEXT_NOT_SET
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.APP_IN_BACKGROUND_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.APP_IN_FOREGROUND_CONTEXT
+import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.CLOSE_REVISION_CARD
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.DELETE_PROFILE_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.END_CARD_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.EXIT_EXPLORATION_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.FINISH_EXPLORATION_CONTEXT
-import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.HINT_OFFERED_CONTEXT
+import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.HINT_UNLOCKED_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.INSTALL_ID_FOR_FAILED_ANALYTICS_LOG
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.OPEN_CONCEPT_CARD
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.OPEN_EXPLORATION_ACTIVITY
@@ -44,10 +47,11 @@ import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.PAUSE_VO
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.PLAY_VOICE_OVER_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.REACH_INVESTED_ENGAGEMENT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.RESUME_EXPLORATION_CONTEXT
-import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.SOLUTION_OFFERED_CONTEXT
+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_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
 import org.oppia.android.app.model.EventLog.ExplorationContext
 import org.oppia.android.app.model.EventLog.HintContext
 import org.oppia.android.app.model.EventLog.LearnerDetailsContext
@@ -58,7 +62,9 @@ import org.oppia.android.app.model.EventLog.QuestionContext
 import org.oppia.android.app.model.EventLog.RevisionCardContext
 import org.oppia.android.app.model.EventLog.StoryContext
 import org.oppia.android.app.model.EventLog.SubmitAnswerContext
+import org.oppia.android.app.model.EventLog.SwitchInLessonLanguageEventContext
 import org.oppia.android.app.model.EventLog.TopicContext
+import org.oppia.android.app.model.OppiaLanguage
 import org.oppia.android.app.model.OppiaMetricLog
 import org.oppia.android.app.model.OppiaMetricLog.LoggableMetric
 import org.oppia.android.app.model.OppiaMetricLog.MemoryTier
@@ -75,6 +81,7 @@ import org.oppia.android.app.model.OppiaMetricLog.StorageTier.HIGH_STORAGE
 import org.oppia.android.app.model.OppiaMetricLog.StorageTier.MEDIUM_STORAGE
 import org.oppia.android.app.model.ScreenName
 import org.oppia.android.app.model.ScreenName.SCREEN_NAME_UNSPECIFIED
+import org.oppia.android.app.model.WrittenTranslationLanguageSelection
 import org.oppia.android.testing.junit.OppiaParameterizedTestRunner
 import org.oppia.android.testing.junit.OppiaParameterizedTestRunner.Iteration
 import org.oppia.android.testing.junit.OppiaParameterizedTestRunner.Parameter
@@ -136,7 +143,7 @@ class EventBundleCreatorTest {
     private const val TEST_CONTENT_ID = "test_content_id"
     private const val TEST_LANGUAGE_CODE = "en"
     private const val TEST_APP_VERSION_NAME = "oppia-android-test-0123456789"
-    private const val TEST_APP_VERSION_CODE = 125
+    private const val TEST_APP_VERSION_CODE = 125L
     private const val TEST_CPU_USAGE = Double.MAX_VALUE
     private const val TEST_APK_SIZE = Long.MAX_VALUE
     private const val TEST_STORAGE_USAGE = Long.MAX_VALUE
@@ -145,19 +152,16 @@ class EventBundleCreatorTest {
     private const val TEST_MEMORY_USAGE = Long.MAX_VALUE
   }
 
-  @Inject
-  lateinit var context: Context
+  @Inject lateinit var context: Context
+  @Inject lateinit var eventBundleCreator: EventBundleCreator
 
-  @Inject
-  lateinit var eventBundleCreator: EventBundleCreator
-
-  @Parameter
-  lateinit var name: String
-
-  @Parameter
-  lateinit var expNameStr: String
+  @Parameter lateinit var name: String
+  @Parameter lateinit var expNameStr: String
+  @Parameter lateinit var inLang: String
+  @Parameter lateinit var expLang: String
 
   private val screenName by lazy { ScreenName.valueOf(name) }
+  private val inputLanguage by lazy { OppiaLanguage.valueOf(inLang) }
 
   @After
   fun tearDown() {
@@ -172,13 +176,18 @@ class EventBundleCreatorTest {
     val typeName = eventBundleCreator.fillEventBundle(EventLog.getDefaultInstance(), bundle)
 
     assertThat(typeName).isEqualTo("ERROR_internal_logging_failure")
-    assertThat(bundle).hasSize(6)
+    assertThat(bundle).hasSize(9)
     assertThat(bundle).longInt("timestamp").isEqualTo(0)
     assertThat(bundle).string("priority").isEqualTo("unspecified_priority")
     assertThat(bundle).integer("event_type").isEqualTo(ACTIVITYCONTEXT_NOT_SET.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("oppia_app_lang").isEqualTo("unset_app_language_selection")
+    assertThat(bundle).string("oppia_content_lang")
+      .isEqualTo("unset_written_translation_language_selection")
+    assertThat(bundle).string("oppia_audio_lang")
+      .isEqualTo("unset_audio_translation_language_selection")
   }
 
   @Test
@@ -213,13 +222,18 @@ class EventBundleCreatorTest {
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
 
     assertThat(typeName).isEqualTo("ERROR_internal_logging_failure")
-    assertThat(bundle).hasSize(6)
+    assertThat(bundle).hasSize(9)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(ACTIVITYCONTEXT_NOT_SET.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("oppia_app_lang").isEqualTo("unset_app_language_selection")
+    assertThat(bundle).string("oppia_content_lang")
+      .isEqualTo("unset_written_translation_language_selection")
+    assertThat(bundle).string("oppia_audio_lang")
+      .isEqualTo("unset_audio_translation_language_selection")
   }
 
   @Test
@@ -244,6 +258,151 @@ class EventBundleCreatorTest {
     assertThat(bundle).string("priority").isEqualTo("optional")
   }
 
+  @Test
+  fun testFillEventBundle_eventWithSystemAppLanguage_savesCorrectAppLanguageInBundle() {
+    setUpTestApplicationComponent()
+    val bundle = Bundle()
+    val eventLog =
+      createEventLog(
+        appLanguageSelection = AppLanguageSelection.newBuilder().apply {
+          useSystemLanguageOrAppDefault = true
+        }.build()
+      )
+
+    eventBundleCreator.fillEventBundle(eventLog, bundle)
+
+    assertThat(bundle).string("oppia_app_lang").isEqualTo("use_system_language_or_app_default")
+  }
+
+  @Test
+  @RunParameterized(
+    Iteration("lang_unspecified", "inLang=LANGUAGE_UNSPECIFIED", "expLang=unspecified_language"),
+    Iteration("ar", "inLang=ARABIC", "expLang=Arabic"),
+    Iteration("en", "inLang=ENGLISH", "expLang=English"),
+    Iteration("hi", "inLang=HINDI", "expLang=Hindi"),
+    Iteration("hi_en", "inLang=HINGLISH", "expLang=Hinglish"),
+    Iteration("pt", "inLang=PORTUGUESE", "expLang=Portuguese"),
+    Iteration("pt_br", "inLang=BRAZILIAN_PORTUGUESE", "expLang=Brazilian Portuguese"),
+    Iteration("sw", "inLang=SWAHILI", "expLang=Swahili")
+  )
+  fun testFillEventBundle_eventWithSelectedAppLanguage_savesCorrectAppLanguageInBundle() {
+    setUpTestApplicationComponent()
+    val bundle = Bundle()
+    val eventLog =
+      createEventLog(
+        appLanguageSelection = AppLanguageSelection.newBuilder().apply {
+          selectedLanguage = inputLanguage
+        }.build()
+      )
+
+    eventBundleCreator.fillEventBundle(eventLog, bundle)
+
+    assertThat(bundle).string("oppia_app_lang").isEqualTo(expLang)
+  }
+
+  @Test
+  fun testFillEventBundle_eventWithUseAppLanguageForWrittenTranslations_savesCorrectWrittenLang() {
+    setUpTestApplicationComponent()
+    val bundle = Bundle()
+    val languageSelection = WrittenTranslationLanguageSelection.newBuilder().apply {
+      useAppLanguage = true
+    }.build()
+    val eventLog = createEventLog(writtenTranslationLanguageSelection = languageSelection)
+
+    eventBundleCreator.fillEventBundle(eventLog, bundle)
+
+    assertThat(bundle).string("oppia_content_lang").isEqualTo("use_app_language")
+  }
+
+  @Test
+  @RunParameterized(
+    Iteration("lang_unspecified", "inLang=LANGUAGE_UNSPECIFIED", "expLang=unspecified_language"),
+    Iteration("ar", "inLang=ARABIC", "expLang=Arabic"),
+    Iteration("en", "inLang=ENGLISH", "expLang=English"),
+    Iteration("hi", "inLang=HINDI", "expLang=Hindi"),
+    Iteration("hi_en", "inLang=HINGLISH", "expLang=Hinglish"),
+    Iteration("pt", "inLang=PORTUGUESE", "expLang=Portuguese"),
+    Iteration("pt_br", "inLang=BRAZILIAN_PORTUGUESE", "expLang=Brazilian Portuguese"),
+    Iteration("sw", "inLang=SWAHILI", "expLang=Swahili")
+  )
+  fun testFillEventBundle_eventWithSelectedWrittenTranslationsLanguage_savesCorrectWrittenLang() {
+    setUpTestApplicationComponent()
+    val bundle = Bundle()
+    val languageSelection = WrittenTranslationLanguageSelection.newBuilder().apply {
+      selectedLanguage = inputLanguage
+    }.build()
+    val eventLog = createEventLog(writtenTranslationLanguageSelection = languageSelection)
+
+    eventBundleCreator.fillEventBundle(eventLog, bundle)
+
+    assertThat(bundle).string("oppia_content_lang").isEqualTo(expLang)
+  }
+
+  @Test
+  fun testFillEventBundle_eventWithUseAppLanguageForAudioTranslations_savesCorrectAudioLang() {
+    setUpTestApplicationComponent()
+    val bundle = Bundle()
+    val languageSelection = AudioTranslationLanguageSelection.newBuilder().apply {
+      useAppLanguage = true
+    }.build()
+    val eventLog = createEventLog(audioTranslationLanguageSelection = languageSelection)
+
+    eventBundleCreator.fillEventBundle(eventLog, bundle)
+
+    assertThat(bundle).string("oppia_audio_lang").isEqualTo("use_app_language")
+  }
+
+  @Test
+  @RunParameterized(
+    Iteration("lang_unspecified", "inLang=LANGUAGE_UNSPECIFIED", "expLang=unspecified_language"),
+    Iteration("ar", "inLang=ARABIC", "expLang=Arabic"),
+    Iteration("en", "inLang=ENGLISH", "expLang=English"),
+    Iteration("hi", "inLang=HINDI", "expLang=Hindi"),
+    Iteration("hi_en", "inLang=HINGLISH", "expLang=Hinglish"),
+    Iteration("pt", "inLang=PORTUGUESE", "expLang=Portuguese"),
+    Iteration("pt_br", "inLang=BRAZILIAN_PORTUGUESE", "expLang=Brazilian Portuguese"),
+    Iteration("sw", "inLang=SWAHILI", "expLang=Swahili")
+  )
+  fun testFillEventBundle_eventWithSelectedAudioTranslationsLanguage_savesCorrectAudioLang() {
+    setUpTestApplicationComponent()
+    val bundle = Bundle()
+    val languageSelection = AudioTranslationLanguageSelection.newBuilder().apply {
+      selectedLanguage = inputLanguage
+    }.build()
+    val eventLog = createEventLog(audioTranslationLanguageSelection = languageSelection)
+
+    eventBundleCreator.fillEventBundle(eventLog, bundle)
+
+    assertThat(bundle).string("oppia_audio_lang").isEqualTo(expLang)
+  }
+
+  @Test
+  fun testFillEventBundle_eventWithMultipleLanguageConfigurations_savesCorrectLanguages() {
+    setUpTestApplicationComponent()
+    val bundle = Bundle()
+    val appLanguageSelection = AppLanguageSelection.newBuilder().apply {
+      selectedLanguage = OppiaLanguage.SWAHILI
+    }.build()
+    val writtenLanguageSelection = WrittenTranslationLanguageSelection.newBuilder().apply {
+      selectedLanguage = OppiaLanguage.ENGLISH
+    }.build()
+    val audioLanguageSelection = AudioTranslationLanguageSelection.newBuilder().apply {
+      selectedLanguage = OppiaLanguage.HINGLISH
+    }.build()
+    val eventLog =
+      createEventLog(
+        appLanguageSelection = appLanguageSelection,
+        writtenTranslationLanguageSelection = writtenLanguageSelection,
+        audioTranslationLanguageSelection = audioLanguageSelection
+      )
+
+    eventBundleCreator.fillEventBundle(eventLog, bundle)
+
+    assertThat(bundle).string("oppia_app_lang").isEqualTo("Swahili")
+    assertThat(bundle).string("oppia_content_lang").isEqualTo("English")
+    assertThat(bundle).string("oppia_audio_lang").isEqualTo("Hinglish")
+  }
+
   @Test
   fun testFillMetricsBundle_eventWithDefaultLoggableMetric_fillsDetailsAndRetsUnknownLog() {
     setUpTestApplicationComponent()
@@ -368,7 +527,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("open_exploration_player_screen")
-    assertThat(bundle).hasSize(12)
+    assertThat(bundle).hasSize(15)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(OPEN_EXPLORATION_ACTIVITY.number)
@@ -392,7 +551,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("open_exploration_player_screen")
-    assertThat(bundle).hasSize(14)
+    assertThat(bundle).hasSize(17)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(OPEN_EXPLORATION_ACTIVITY.number)
@@ -418,7 +577,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("select_topic_info_tab")
-    assertThat(bundle).hasSize(7)
+    assertThat(bundle).hasSize(10)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(OPEN_INFO_TAB.number)
@@ -437,7 +596,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("select_topic_lessons_tab")
-    assertThat(bundle).hasSize(7)
+    assertThat(bundle).hasSize(10)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(OPEN_LESSONS_TAB.number)
@@ -619,7 +778,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("select_topic_practice_tab")
-    assertThat(bundle).hasSize(7)
+    assertThat(bundle).hasSize(10)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(OPEN_PRACTICE_TAB.number)
@@ -638,7 +797,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("select_topic_revision_tab")
-    assertThat(bundle).hasSize(7)
+    assertThat(bundle).hasSize(10)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(OPEN_REVISION_TAB.number)
@@ -657,7 +816,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("open_question_player_screen")
-    assertThat(bundle).hasSize(8)
+    assertThat(bundle).hasSize(11)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(OPEN_QUESTION_PLAYER.number)
@@ -677,7 +836,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("open_story_chapter_list_screen")
-    assertThat(bundle).hasSize(8)
+    assertThat(bundle).hasSize(11)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(OPEN_STORY_ACTIVITY.number)
@@ -697,7 +856,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("open_concept_card")
-    assertThat(bundle).hasSize(7)
+    assertThat(bundle).hasSize(10)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(OPEN_CONCEPT_CARD.number)
@@ -716,7 +875,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("open_revision_card")
-    assertThat(bundle).hasSize(8)
+    assertThat(bundle).hasSize(11)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(OPEN_REVISION_CARD.number)
@@ -727,6 +886,26 @@ class EventBundleCreatorTest {
     assertThat(bundle).string("subtopic_index").isEqualTo(TEST_SUB_TOPIC_INDEX_STR)
   }
 
+  @Test
+  fun testFillEventBundle_closeRevisionCardContextEvent_fillsAllFieldsInBundleAndReturnsName() {
+    setUpTestApplicationComponent()
+    val bundle = Bundle()
+
+    val eventLog = createEventLog(context = createCloseRevisionCard())
+
+    val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
+    assertThat(typeName).isEqualTo("close_revision_card")
+    assertThat(bundle).hasSize(11)
+    assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
+    assertThat(bundle).string("priority").isEqualTo("essential")
+    assertThat(bundle).integer("event_type").isEqualTo(CLOSE_REVISION_CARD.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("topic_id").isEqualTo(TEST_TOPIC_ID)
+    assertThat(bundle).string("subtopic_index").isEqualTo(TEST_SUB_TOPIC_INDEX_STR)
+  }
+
   @Test
   fun testFillEventBundle_startCardContextEvent_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName() {
     setUpTestApplicationComponentWithoutLearnerAnalyticsStudy()
@@ -736,7 +915,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("start_exploration_card")
-    assertThat(bundle).hasSize(13)
+    assertThat(bundle).hasSize(16)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(START_CARD_CONTEXT.number)
@@ -761,7 +940,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("start_exploration_card")
-    assertThat(bundle).hasSize(15)
+    assertThat(bundle).hasSize(18)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(START_CARD_CONTEXT.number)
@@ -788,7 +967,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("end_exploration_card")
-    assertThat(bundle).hasSize(13)
+    assertThat(bundle).hasSize(16)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(END_CARD_CONTEXT.number)
@@ -813,7 +992,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("end_exploration_card")
-    assertThat(bundle).hasSize(15)
+    assertThat(bundle).hasSize(18)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(END_CARD_CONTEXT.number)
@@ -832,18 +1011,18 @@ class EventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_hintOfferedEvent_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName() {
+  fun testFillEventBundle_hintUnlockedEvent_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName() {
     setUpTestApplicationComponentWithoutLearnerAnalyticsStudy()
     val bundle = Bundle()
 
-    val eventLog = createEventLog(context = createHintOfferedContext())
+    val eventLog = createEventLog(context = createHintUnlockedContext())
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
-    assertThat(typeName).isEqualTo("receive_hint_offer")
-    assertThat(bundle).hasSize(13)
+    assertThat(typeName).isEqualTo("unlock_hint")
+    assertThat(bundle).hasSize(16)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
-    assertThat(bundle).integer("event_type").isEqualTo(HINT_OFFERED_CONTEXT.number)
+    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)
@@ -857,18 +1036,18 @@ class EventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_hintOfferedEvent_studyOn_fillsAllFieldsAndReturnsName() {
+  fun testFillEventBundle_hintUnlockedEvent_studyOn_fillsAllFieldsAndReturnsName() {
     setUpTestApplicationComponentWithLearnerAnalyticsStudy()
     val bundle = Bundle()
 
-    val eventLog = createEventLog(context = createHintOfferedContext())
+    val eventLog = createEventLog(context = createHintUnlockedContext())
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
-    assertThat(typeName).isEqualTo("receive_hint_offer")
-    assertThat(bundle).hasSize(15)
+    assertThat(typeName).isEqualTo("unlock_hint")
+    assertThat(bundle).hasSize(18)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
-    assertThat(bundle).integer("event_type").isEqualTo(HINT_OFFERED_CONTEXT.number)
+    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)
@@ -892,7 +1071,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("reveal_hint")
-    assertThat(bundle).hasSize(13)
+    assertThat(bundle).hasSize(16)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(ACCESS_HINT_CONTEXT.number)
@@ -917,7 +1096,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("reveal_hint")
-    assertThat(bundle).hasSize(15)
+    assertThat(bundle).hasSize(18)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(ACCESS_HINT_CONTEXT.number)
@@ -936,18 +1115,18 @@ class EventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_solutionOfferedEvent_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName() {
+  fun testFillEventBundle_solutionUnlockedEvent_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName() {
     setUpTestApplicationComponentWithoutLearnerAnalyticsStudy()
     val bundle = Bundle()
 
-    val eventLog = createEventLog(context = createSolutionOfferedContext())
+    val eventLog = createEventLog(context = createSolutionUnlockedContext())
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
-    assertThat(typeName).isEqualTo("receive_solution_offer")
-    assertThat(bundle).hasSize(12)
+    assertThat(typeName).isEqualTo("unlock_solution")
+    assertThat(bundle).hasSize(15)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
-    assertThat(bundle).integer("event_type").isEqualTo(SOLUTION_OFFERED_CONTEXT.number)
+    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)
@@ -960,18 +1139,18 @@ class EventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_solutionOfferedEvent_studyOn_fillsAllFieldsAndReturnsName() {
+  fun testFillEventBundle_solutionUnlockedEvent_studyOn_fillsAllFieldsAndReturnsName() {
     setUpTestApplicationComponentWithLearnerAnalyticsStudy()
     val bundle = Bundle()
 
-    val eventLog = createEventLog(context = createSolutionOfferedContext())
+    val eventLog = createEventLog(context = createSolutionUnlockedContext())
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
-    assertThat(typeName).isEqualTo("receive_solution_offer")
-    assertThat(bundle).hasSize(14)
+    assertThat(typeName).isEqualTo("unlock_solution")
+    assertThat(bundle).hasSize(17)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
-    assertThat(bundle).integer("event_type").isEqualTo(SOLUTION_OFFERED_CONTEXT.number)
+    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)
@@ -994,7 +1173,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("reveal_solution")
-    assertThat(bundle).hasSize(12)
+    assertThat(bundle).hasSize(15)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(ACCESS_SOLUTION_CONTEXT.number)
@@ -1018,7 +1197,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("reveal_solution")
-    assertThat(bundle).hasSize(14)
+    assertThat(bundle).hasSize(17)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(ACCESS_SOLUTION_CONTEXT.number)
@@ -1044,7 +1223,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("submit_answer")
-    assertThat(bundle).hasSize(14)
+    assertThat(bundle).hasSize(17)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(SUBMIT_ANSWER_CONTEXT.number)
@@ -1070,7 +1249,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("submit_answer")
-    assertThat(bundle).hasSize(16)
+    assertThat(bundle).hasSize(19)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(SUBMIT_ANSWER_CONTEXT.number)
@@ -1098,7 +1277,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("click_play_voiceover_button")
-    assertThat(bundle).hasSize(14)
+    assertThat(bundle).hasSize(17)
     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)
@@ -1124,7 +1303,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("click_play_voiceover_button")
-    assertThat(bundle).hasSize(16)
+    assertThat(bundle).hasSize(19)
     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)
@@ -1152,7 +1331,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("click_pause_voiceover_button")
-    assertThat(bundle).hasSize(14)
+    assertThat(bundle).hasSize(17)
     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)
@@ -1178,7 +1357,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("click_pause_voiceover_button")
-    assertThat(bundle).hasSize(16)
+    assertThat(bundle).hasSize(19)
     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)
@@ -1206,7 +1385,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("send_app_to_background")
-    assertThat(bundle).hasSize(6)
+    assertThat(bundle).hasSize(9)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(APP_IN_BACKGROUND_CONTEXT.number)
@@ -1224,7 +1403,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("send_app_to_background")
-    assertThat(bundle).hasSize(8)
+    assertThat(bundle).hasSize(11)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(APP_IN_BACKGROUND_CONTEXT.number)
@@ -1244,7 +1423,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("bring_app_to_foreground")
-    assertThat(bundle).hasSize(6)
+    assertThat(bundle).hasSize(9)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(APP_IN_FOREGROUND_CONTEXT.number)
@@ -1262,7 +1441,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("bring_app_to_foreground")
-    assertThat(bundle).hasSize(8)
+    assertThat(bundle).hasSize(11)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(APP_IN_FOREGROUND_CONTEXT.number)
@@ -1282,7 +1461,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("leave_exploration")
-    assertThat(bundle).hasSize(12)
+    assertThat(bundle).hasSize(15)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(EXIT_EXPLORATION_CONTEXT.number)
@@ -1306,7 +1485,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("leave_exploration")
-    assertThat(bundle).hasSize(14)
+    assertThat(bundle).hasSize(17)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(EXIT_EXPLORATION_CONTEXT.number)
@@ -1332,7 +1511,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("complete_exploration")
-    assertThat(bundle).hasSize(12)
+    assertThat(bundle).hasSize(15)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(FINISH_EXPLORATION_CONTEXT.number)
@@ -1356,7 +1535,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("complete_exploration")
-    assertThat(bundle).hasSize(14)
+    assertThat(bundle).hasSize(17)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(FINISH_EXPLORATION_CONTEXT.number)
@@ -1382,7 +1561,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("resume_in_progress_exploration")
-    assertThat(bundle).hasSize(6)
+    assertThat(bundle).hasSize(9)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(RESUME_EXPLORATION_CONTEXT.number)
@@ -1400,7 +1579,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("resume_in_progress_exploration")
-    assertThat(bundle).hasSize(8)
+    assertThat(bundle).hasSize(11)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(RESUME_EXPLORATION_CONTEXT.number)
@@ -1420,7 +1599,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("restart_in_progress_exploration")
-    assertThat(bundle).hasSize(6)
+    assertThat(bundle).hasSize(9)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(START_OVER_EXPLORATION_CONTEXT.number)
@@ -1438,7 +1617,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("restart_in_progress_exploration")
-    assertThat(bundle).hasSize(8)
+    assertThat(bundle).hasSize(11)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(START_OVER_EXPLORATION_CONTEXT.number)
@@ -1458,7 +1637,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("delete_profile")
-    assertThat(bundle).hasSize(6)
+    assertThat(bundle).hasSize(9)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(DELETE_PROFILE_CONTEXT.number)
@@ -1476,7 +1655,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("delete_profile")
-    assertThat(bundle).hasSize(8)
+    assertThat(bundle).hasSize(11)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(DELETE_PROFILE_CONTEXT.number)
@@ -1496,7 +1675,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("open_home_screen")
-    assertThat(bundle).hasSize(6)
+    assertThat(bundle).hasSize(9)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(OPEN_HOME.number)
@@ -1514,7 +1693,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("open_profile_chooser_screen")
-    assertThat(bundle).hasSize(6)
+    assertThat(bundle).hasSize(9)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(OPEN_PROFILE_CHOOSER.number)
@@ -1532,7 +1711,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("reach_invested_engagement")
-    assertThat(bundle).hasSize(12)
+    assertThat(bundle).hasSize(15)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(REACH_INVESTED_ENGAGEMENT.number)
@@ -1556,7 +1735,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("reach_invested_engagement")
-    assertThat(bundle).hasSize(14)
+    assertThat(bundle).hasSize(17)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(REACH_INVESTED_ENGAGEMENT.number)
@@ -1573,6 +1752,60 @@ class EventBundleCreatorTest {
     assertThat(bundle).string("ld_install_id").isEqualTo(TEST_INSTALLATION_ID)
   }
 
+  @Test
+  fun testFillEventBundle_switchInLessonLanguageEvent_studyOff_fillsAllFieldsAndReturnsName() {
+    setUpTestApplicationComponent()
+    val bundle = Bundle()
+
+    val eventLog = createEventLog(context = createSwitchInLessonLanguageContext())
+
+    val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
+    assertThat(typeName).isEqualTo("click_switch_language_in_lesson")
+    assertThat(bundle).hasSize(17)
+    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_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)
+    assertThat(bundle).string("ed_session_id").isEqualTo(TEST_LEARNER_SESSION_ID)
+    assertThat(bundle).string("ed_exploration_version").isEqualTo(TEST_EXPLORATION_VERSION_STR)
+    assertThat(bundle).string("ed_state_name").isEqualTo(TEST_STATE_NAME)
+    assertThat(bundle).string("from_language").isEqualTo("English")
+    assertThat(bundle).string("to_language").isEqualTo("Swahili")
+  }
+
+  @Test
+  fun testFillEventBundle_switchInLessonLanguageEvent_studyOn_fillsNonSensitiveDataAndRetsName() {
+    setUpTestApplicationComponentWithLearnerAnalyticsStudy()
+    val bundle = Bundle()
+
+    val eventLog = createEventLog(context = createSwitchInLessonLanguageContext())
+
+    val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
+    assertThat(typeName).isEqualTo("click_switch_language_in_lesson")
+    assertThat(bundle).hasSize(19)
+    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_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)
+    assertThat(bundle).string("ed_session_id").isEqualTo(TEST_LEARNER_SESSION_ID)
+    assertThat(bundle).string("ed_exploration_version").isEqualTo(TEST_EXPLORATION_VERSION_STR)
+    assertThat(bundle).string("ed_state_name").isEqualTo(TEST_STATE_NAME)
+    assertThat(bundle).string("ed_ld_learner_id").isEqualTo(TEST_LEARNER_ID)
+    assertThat(bundle).string("ed_ld_install_id").isEqualTo(TEST_INSTALLATION_ID)
+    assertThat(bundle).string("from_language").isEqualTo("English")
+    assertThat(bundle).string("to_language").isEqualTo("Swahili")
+  }
+
   @Test
   fun testFillEventBundle_failedEventInstallId_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName() {
     setUpTestApplicationComponentWithoutLearnerAnalyticsStudy()
@@ -1582,7 +1815,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("ERROR_internal_logging_failure")
-    assertThat(bundle).hasSize(6)
+    assertThat(bundle).hasSize(9)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(INSTALL_ID_FOR_FAILED_ANALYTICS_LOG.number)
@@ -1600,7 +1833,7 @@ class EventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("ERROR_internal_logging_failure")
-    assertThat(bundle).hasSize(7)
+    assertThat(bundle).hasSize(10)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(INSTALL_ID_FOR_FAILED_ANALYTICS_LOG.number)
@@ -1764,10 +1997,18 @@ class EventBundleCreatorTest {
   private fun createEventLog(
     timestamp: Long = TEST_TIMESTAMP_1,
     priority: EventLog.Priority = ESSENTIAL,
-    context: EventLog.Context = EventLog.Context.getDefaultInstance()
+    context: EventLog.Context = EventLog.Context.getDefaultInstance(),
+    appLanguageSelection: AppLanguageSelection = AppLanguageSelection.getDefaultInstance(),
+    writtenTranslationLanguageSelection: WrittenTranslationLanguageSelection =
+      WrittenTranslationLanguageSelection.getDefaultInstance(),
+    audioTranslationLanguageSelection: AudioTranslationLanguageSelection =
+      AudioTranslationLanguageSelection.getDefaultInstance()
   ) = EventLog.newBuilder().apply {
     this.timestamp = timestamp
     this.priority = priority
+    this.appLanguageSelection = appLanguageSelection
+    this.writtenTranslationLanguageSelection = writtenTranslationLanguageSelection
+    this.audioTranslationLanguageSelection = audioTranslationLanguageSelection
     this.context = context
   }.build()
 
@@ -1821,21 +2062,25 @@ class EventBundleCreatorTest {
     revisionCardContext: RevisionCardContext = createRevisionCardContext()
   ) = createEventContext(revisionCardContext, EventContextBuilder::setOpenRevisionCard)
 
+  private fun createCloseRevisionCard(
+    revisionCardContext: RevisionCardContext = createRevisionCardContext()
+  ) = createEventContext(revisionCardContext, EventContextBuilder::setCloseRevisionCard)
+
   private fun createStartCardContext(cardContext: CardContext = createCardContext()) =
     createEventContext(cardContext, EventContextBuilder::setStartCardContext)
 
   private fun createEndCardContext(cardContext: CardContext = createCardContext()) =
     createEventContext(cardContext, EventContextBuilder::setEndCardContext)
 
-  private fun createHintOfferedContext(hintContext: HintContext = createHintContext()) =
-    createEventContext(hintContext, EventContextBuilder::setHintOfferedContext)
+  private fun createHintUnlockedContext(hintContext: HintContext = createHintContext()) =
+    createEventContext(hintContext, EventContextBuilder::setHintUnlockedContext)
 
   private fun createAccessHintContext(hintContext: HintContext = createHintContext()) =
     createEventContext(hintContext, EventContextBuilder::setAccessHintContext)
 
-  private fun createSolutionOfferedContext(
+  private fun createSolutionUnlockedContext(
     explorationContext: ExplorationContext = createExplorationContext()
-  ) = createEventContext(explorationContext, EventContextBuilder::setSolutionOfferedContext)
+  ) = createEventContext(explorationContext, EventContextBuilder::setSolutionUnlockedContext)
 
   private fun createAccessSolutionContext(
     explorationContext: ExplorationContext = createExplorationContext()
@@ -1891,6 +2136,11 @@ class EventBundleCreatorTest {
     explorationContext: ExplorationContext = createExplorationContext()
   ) = createEventContext(explorationContext, EventContextBuilder::setReachInvestedEngagement)
 
+  private fun createSwitchInLessonLanguageContext(
+    switchLanguageContext: SwitchInLessonLanguageEventContext =
+      createSwitchInLessonLanguageEventContext(),
+  ) = createEventContext(switchLanguageContext, EventContextBuilder::setSwitchInLessonLanguage)
+
   private fun createInstallationIdForFailedAnalyticsLogContext(
     installationId: String = TEST_INSTALLATION_ID
   ) = createEventContext(installationId, EventContextBuilder::setInstallIdForFailedAnalyticsLog)
@@ -2000,6 +2250,16 @@ class EventBundleCreatorTest {
     this.languageCode = languageCode
   }.build()
 
+  private fun createSwitchInLessonLanguageEventContext(
+    explorationDetails: ExplorationContext = createExplorationContext(),
+    switchFromLanguage: OppiaLanguage = OppiaLanguage.ENGLISH,
+    switchToLanguage: OppiaLanguage = OppiaLanguage.SWAHILI
+  ) = SwitchInLessonLanguageEventContext.newBuilder().apply {
+    this.explorationDetails = explorationDetails
+    this.switchFromLanguage = switchFromLanguage
+    this.switchToLanguage = switchToLanguage
+  }.build()
+
   private fun registerTestApplication() {
     val packageManager = Shadows.shadowOf(context.packageManager)
     val applicationInfo =
@@ -2012,11 +2272,11 @@ class EventBundleCreatorTest {
         .setApplicationInfo(applicationInfo)
         .build()
     packageInfo.versionName = TEST_APP_VERSION_NAME
-    packageInfo.versionCode = TEST_APP_VERSION_CODE
+    packageInfo.longVersionCode = TEST_APP_VERSION_CODE
     packageManager.installPackage(packageInfo)
   }
 
-  private fun createApkSizeLoggableMetric() = OppiaMetricLog.LoggableMetric.newBuilder()
+  private fun createApkSizeLoggableMetric() = LoggableMetric.newBuilder()
     .setApkSizeMetric(
       OppiaMetricLog.ApkSizeMetric.newBuilder()
         .setApkSizeBytes(TEST_APK_SIZE)
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 a5c3d0ffdc3..6b96bf30a4d 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
@@ -24,11 +24,12 @@ import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.ACCESS_S
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.ACTIVITYCONTEXT_NOT_SET
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.APP_IN_BACKGROUND_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.APP_IN_FOREGROUND_CONTEXT
+import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.CLOSE_REVISION_CARD
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.DELETE_PROFILE_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.END_CARD_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.EXIT_EXPLORATION_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.FINISH_EXPLORATION_CONTEXT
-import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.HINT_OFFERED_CONTEXT
+import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.HINT_UNLOCKED_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.INSTALL_ID_FOR_FAILED_ANALYTICS_LOG
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.OPEN_CONCEPT_CARD
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.OPEN_EXPLORATION_ACTIVITY
@@ -44,10 +45,11 @@ import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.OPEN_STO
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.PAUSE_VOICE_OVER_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.PLAY_VOICE_OVER_CONTEXT
 import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.RESUME_EXPLORATION_CONTEXT
-import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.SOLUTION_OFFERED_CONTEXT
+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_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
 import org.oppia.android.app.model.EventLog.ExplorationContext
 import org.oppia.android.app.model.EventLog.HintContext
 import org.oppia.android.app.model.EventLog.LearnerDetailsContext
@@ -58,7 +60,9 @@ import org.oppia.android.app.model.EventLog.QuestionContext
 import org.oppia.android.app.model.EventLog.RevisionCardContext
 import org.oppia.android.app.model.EventLog.StoryContext
 import org.oppia.android.app.model.EventLog.SubmitAnswerContext
+import org.oppia.android.app.model.EventLog.SwitchInLessonLanguageEventContext
 import org.oppia.android.app.model.EventLog.TopicContext
+import org.oppia.android.app.model.OppiaLanguage
 import org.oppia.android.util.platformparameter.EnableLearnerStudyAnalytics
 import org.oppia.android.util.platformparameter.LEARNER_STUDY_ANALYTICS_DEFAULT_VALUE
 import org.oppia.android.util.platformparameter.PlatformParameterValue
@@ -109,7 +113,7 @@ class KenyaAlphaEventBundleCreatorTest {
     private const val TEST_CONTENT_ID = "test_content_id"
     private const val TEST_LANGUAGE_CODE = "en"
     private const val TEST_APP_VERSION_NAME = "oppia-android-test-0123456789"
-    private const val TEST_APP_VERSION_CODE = 125
+    private const val TEST_APP_VERSION_CODE = 125L
   }
 
   @Inject lateinit var context: Context
@@ -128,7 +132,7 @@ class KenyaAlphaEventBundleCreatorTest {
     val typeName = eventBundleCreator.fillEventBundle(EventLog.getDefaultInstance(), bundle)
 
     assertThat(typeName).isEqualTo("unknown_activity_context")
-    assertThat(bundle).hasSize(6)
+    assertThat(bundle).hasSize(9)
     assertThat(bundle).longInt("timestamp").isEqualTo(0)
     assertThat(bundle).string("priority").isEqualTo("unspecified_priority")
     assertThat(bundle).integer("event_type").isEqualTo(ACTIVITYCONTEXT_NOT_SET.number)
@@ -146,7 +150,7 @@ class KenyaAlphaEventBundleCreatorTest {
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
 
     assertThat(typeName).isEqualTo("unknown_activity_context")
-    assertThat(bundle).hasSize(6)
+    assertThat(bundle).hasSize(9)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(ACTIVITYCONTEXT_NOT_SET.number)
@@ -186,7 +190,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("open_exploration_activity")
-    assertThat(bundle).hasSize(12)
+    assertThat(bundle).hasSize(15)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(OPEN_EXPLORATION_ACTIVITY.number)
@@ -210,7 +214,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("open_exploration_activity")
-    assertThat(bundle).hasSize(14)
+    assertThat(bundle).hasSize(17)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(OPEN_EXPLORATION_ACTIVITY.number)
@@ -236,7 +240,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("open_info_tab")
-    assertThat(bundle).hasSize(7)
+    assertThat(bundle).hasSize(10)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(OPEN_INFO_TAB.number)
@@ -255,7 +259,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("open_lessons_tab")
-    assertThat(bundle).hasSize(7)
+    assertThat(bundle).hasSize(10)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(OPEN_LESSONS_TAB.number)
@@ -274,7 +278,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("open_practice_tab")
-    assertThat(bundle).hasSize(7)
+    assertThat(bundle).hasSize(10)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(OPEN_PRACTICE_TAB.number)
@@ -293,7 +297,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("open_revision_tab")
-    assertThat(bundle).hasSize(7)
+    assertThat(bundle).hasSize(10)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(OPEN_REVISION_TAB.number)
@@ -312,7 +316,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("open_question_player")
-    assertThat(bundle).hasSize(8)
+    assertThat(bundle).hasSize(11)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(OPEN_QUESTION_PLAYER.number)
@@ -332,7 +336,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("open_story_activity")
-    assertThat(bundle).hasSize(8)
+    assertThat(bundle).hasSize(11)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(OPEN_STORY_ACTIVITY.number)
@@ -352,7 +356,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("open_concept_card")
-    assertThat(bundle).hasSize(7)
+    assertThat(bundle).hasSize(10)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(OPEN_CONCEPT_CARD.number)
@@ -371,7 +375,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("open_revision_card")
-    assertThat(bundle).hasSize(8)
+    assertThat(bundle).hasSize(11)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(OPEN_REVISION_CARD.number)
@@ -382,6 +386,26 @@ class KenyaAlphaEventBundleCreatorTest {
     assertThat(bundle).string("subtopic_index").isEqualTo(TEST_SUB_TOPIC_INDEX_STR)
   }
 
+  @Test
+  fun testFillEventBundle_closeRevisionCardContextEvent_fillsAllFieldsInBundleAndReturnsName() {
+    setUpTestApplicationComponent()
+    val bundle = Bundle()
+
+    val eventLog = createEventLog(context = createCloseRevisionCard())
+
+    val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
+    assertThat(typeName).isEqualTo("close_revision_card")
+    assertThat(bundle).hasSize(11)
+    assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
+    assertThat(bundle).string("priority").isEqualTo("essential")
+    assertThat(bundle).integer("event_type").isEqualTo(CLOSE_REVISION_CARD.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("topic_id").isEqualTo(TEST_TOPIC_ID)
+    assertThat(bundle).string("subtopic_index").isEqualTo(TEST_SUB_TOPIC_INDEX_STR)
+  }
+
   @Test
   fun testFillEventBundle_startCardContextEvent_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName() {
     setUpTestApplicationComponentWithoutLearnerAnalyticsStudy()
@@ -391,7 +415,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("start_card_context")
-    assertThat(bundle).hasSize(13)
+    assertThat(bundle).hasSize(16)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(START_CARD_CONTEXT.number)
@@ -416,7 +440,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("start_card_context")
-    assertThat(bundle).hasSize(15)
+    assertThat(bundle).hasSize(18)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(START_CARD_CONTEXT.number)
@@ -443,7 +467,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("end_card_context")
-    assertThat(bundle).hasSize(13)
+    assertThat(bundle).hasSize(16)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(END_CARD_CONTEXT.number)
@@ -468,7 +492,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("end_card_context")
-    assertThat(bundle).hasSize(15)
+    assertThat(bundle).hasSize(18)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(END_CARD_CONTEXT.number)
@@ -487,18 +511,18 @@ class KenyaAlphaEventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_hintOfferedEvent_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName() {
+  fun testFillEventBundle_hintUnlockedEvent_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName() {
     setUpTestApplicationComponentWithoutLearnerAnalyticsStudy()
     val bundle = Bundle()
 
-    val eventLog = createEventLog(context = createHintOfferedContext())
+    val eventLog = createEventLog(context = createHintUnlockedContext())
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("hint_offered_context")
-    assertThat(bundle).hasSize(13)
+    assertThat(bundle).hasSize(16)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
-    assertThat(bundle).integer("event_type").isEqualTo(HINT_OFFERED_CONTEXT.number)
+    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)
@@ -512,18 +536,18 @@ class KenyaAlphaEventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_hintOfferedEvent_studyOn_fillsAllFieldsAndReturnsName() {
+  fun testFillEventBundle_hintUnlockedEvent_studyOn_fillsAllFieldsAndReturnsName() {
     setUpTestApplicationComponentWithLearnerAnalyticsStudy()
     val bundle = Bundle()
 
-    val eventLog = createEventLog(context = createHintOfferedContext())
+    val eventLog = createEventLog(context = createHintUnlockedContext())
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("hint_offered_context")
-    assertThat(bundle).hasSize(15)
+    assertThat(bundle).hasSize(18)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
-    assertThat(bundle).integer("event_type").isEqualTo(HINT_OFFERED_CONTEXT.number)
+    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)
@@ -547,7 +571,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("access_hint_context")
-    assertThat(bundle).hasSize(13)
+    assertThat(bundle).hasSize(16)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(ACCESS_HINT_CONTEXT.number)
@@ -572,7 +596,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("access_hint_context")
-    assertThat(bundle).hasSize(15)
+    assertThat(bundle).hasSize(18)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(ACCESS_HINT_CONTEXT.number)
@@ -591,18 +615,18 @@ class KenyaAlphaEventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_solutionOfferedEvent_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName() {
+  fun testFillEventBundle_solutionUnlockedEvent_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName() {
     setUpTestApplicationComponentWithoutLearnerAnalyticsStudy()
     val bundle = Bundle()
 
-    val eventLog = createEventLog(context = createSolutionOfferedContext())
+    val eventLog = createEventLog(context = createSolutionUnlockedContext())
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("solution_offered_context")
-    assertThat(bundle).hasSize(12)
+    assertThat(bundle).hasSize(15)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
-    assertThat(bundle).integer("event_type").isEqualTo(SOLUTION_OFFERED_CONTEXT.number)
+    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)
@@ -615,18 +639,18 @@ class KenyaAlphaEventBundleCreatorTest {
   }
 
   @Test
-  fun testFillEventBundle_solutionOfferedEvent_studyOn_fillsAllFieldsAndReturnsName() {
+  fun testFillEventBundle_solutionUnlockedEvent_studyOn_fillsAllFieldsAndReturnsName() {
     setUpTestApplicationComponentWithLearnerAnalyticsStudy()
     val bundle = Bundle()
 
-    val eventLog = createEventLog(context = createSolutionOfferedContext())
+    val eventLog = createEventLog(context = createSolutionUnlockedContext())
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("solution_offered_context")
-    assertThat(bundle).hasSize(14)
+    assertThat(bundle).hasSize(17)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
-    assertThat(bundle).integer("event_type").isEqualTo(SOLUTION_OFFERED_CONTEXT.number)
+    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)
@@ -649,7 +673,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("access_solution_context")
-    assertThat(bundle).hasSize(12)
+    assertThat(bundle).hasSize(15)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(ACCESS_SOLUTION_CONTEXT.number)
@@ -673,7 +697,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("access_solution_context")
-    assertThat(bundle).hasSize(14)
+    assertThat(bundle).hasSize(17)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(ACCESS_SOLUTION_CONTEXT.number)
@@ -699,7 +723,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("submit_answer_context")
-    assertThat(bundle).hasSize(14)
+    assertThat(bundle).hasSize(17)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(SUBMIT_ANSWER_CONTEXT.number)
@@ -725,7 +749,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("submit_answer_context")
-    assertThat(bundle).hasSize(16)
+    assertThat(bundle).hasSize(19)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(SUBMIT_ANSWER_CONTEXT.number)
@@ -753,7 +777,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("play_voice_over_context")
-    assertThat(bundle).hasSize(14)
+    assertThat(bundle).hasSize(17)
     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)
@@ -779,7 +803,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("play_voice_over_context")
-    assertThat(bundle).hasSize(16)
+    assertThat(bundle).hasSize(19)
     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)
@@ -807,7 +831,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("pause_voice_over_context")
-    assertThat(bundle).hasSize(14)
+    assertThat(bundle).hasSize(17)
     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)
@@ -833,7 +857,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("pause_voice_over_context")
-    assertThat(bundle).hasSize(16)
+    assertThat(bundle).hasSize(19)
     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)
@@ -861,7 +885,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("app_in_background_context")
-    assertThat(bundle).hasSize(6)
+    assertThat(bundle).hasSize(9)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(APP_IN_BACKGROUND_CONTEXT.number)
@@ -879,7 +903,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("app_in_background_context")
-    assertThat(bundle).hasSize(8)
+    assertThat(bundle).hasSize(11)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(APP_IN_BACKGROUND_CONTEXT.number)
@@ -899,7 +923,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("app_in_foreground_context")
-    assertThat(bundle).hasSize(6)
+    assertThat(bundle).hasSize(9)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(APP_IN_FOREGROUND_CONTEXT.number)
@@ -917,7 +941,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("app_in_foreground_context")
-    assertThat(bundle).hasSize(8)
+    assertThat(bundle).hasSize(11)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(APP_IN_FOREGROUND_CONTEXT.number)
@@ -937,7 +961,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("exit_exploration_context")
-    assertThat(bundle).hasSize(12)
+    assertThat(bundle).hasSize(15)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(EXIT_EXPLORATION_CONTEXT.number)
@@ -961,7 +985,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("exit_exploration_context")
-    assertThat(bundle).hasSize(14)
+    assertThat(bundle).hasSize(17)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(EXIT_EXPLORATION_CONTEXT.number)
@@ -987,7 +1011,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("finish_exploration_context")
-    assertThat(bundle).hasSize(12)
+    assertThat(bundle).hasSize(15)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(FINISH_EXPLORATION_CONTEXT.number)
@@ -1011,7 +1035,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("finish_exploration_context")
-    assertThat(bundle).hasSize(14)
+    assertThat(bundle).hasSize(17)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(FINISH_EXPLORATION_CONTEXT.number)
@@ -1037,7 +1061,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("resume_exploration_context")
-    assertThat(bundle).hasSize(6)
+    assertThat(bundle).hasSize(9)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(RESUME_EXPLORATION_CONTEXT.number)
@@ -1055,7 +1079,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("resume_exploration_context")
-    assertThat(bundle).hasSize(8)
+    assertThat(bundle).hasSize(11)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(RESUME_EXPLORATION_CONTEXT.number)
@@ -1075,7 +1099,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("start_over_exploration_context")
-    assertThat(bundle).hasSize(6)
+    assertThat(bundle).hasSize(9)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(START_OVER_EXPLORATION_CONTEXT.number)
@@ -1093,7 +1117,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("start_over_exploration_context")
-    assertThat(bundle).hasSize(8)
+    assertThat(bundle).hasSize(11)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(START_OVER_EXPLORATION_CONTEXT.number)
@@ -1113,7 +1137,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("delete_profile_context")
-    assertThat(bundle).hasSize(6)
+    assertThat(bundle).hasSize(9)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(DELETE_PROFILE_CONTEXT.number)
@@ -1131,7 +1155,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("delete_profile_context")
-    assertThat(bundle).hasSize(8)
+    assertThat(bundle).hasSize(11)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(DELETE_PROFILE_CONTEXT.number)
@@ -1151,7 +1175,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("open_home")
-    assertThat(bundle).hasSize(6)
+    assertThat(bundle).hasSize(9)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(OPEN_HOME.number)
@@ -1169,7 +1193,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("open_profile_chooser")
-    assertThat(bundle).hasSize(6)
+    assertThat(bundle).hasSize(9)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(OPEN_PROFILE_CHOOSER.number)
@@ -1178,6 +1202,60 @@ class KenyaAlphaEventBundleCreatorTest {
     assertThat(bundle).integer("app_version_code").isEqualTo(TEST_APP_VERSION_CODE)
   }
 
+  @Test
+  fun testFillEventBundle_switchInLessonLanguageEvent_studyOff_fillsAllFieldsAndReturnsName() {
+    setUpTestApplicationComponent()
+    val bundle = Bundle()
+
+    val eventLog = createEventLog(context = createSwitchInLessonLanguageContext())
+
+    val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
+    assertThat(typeName).isEqualTo("switch_in_lesson_language")
+    assertThat(bundle).hasSize(17)
+    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_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)
+    assertThat(bundle).string("ed_session_id").isEqualTo(TEST_LEARNER_SESSION_ID)
+    assertThat(bundle).string("ed_exploration_version").isEqualTo(TEST_EXPLORATION_VERSION_STR)
+    assertThat(bundle).string("ed_state_name").isEqualTo(TEST_STATE_NAME)
+    assertThat(bundle).string("from_language").isEqualTo("English")
+    assertThat(bundle).string("to_language").isEqualTo("Swahili")
+  }
+
+  @Test
+  fun testFillEventBundle_switchInLessonLanguageEvent_studyOn_fillsNonSensitiveDataAndRetsName() {
+    setUpTestApplicationComponentWithLearnerAnalyticsStudy()
+    val bundle = Bundle()
+
+    val eventLog = createEventLog(context = createSwitchInLessonLanguageContext())
+
+    val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
+    assertThat(typeName).isEqualTo("switch_in_lesson_language")
+    assertThat(bundle).hasSize(19)
+    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_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)
+    assertThat(bundle).string("ed_session_id").isEqualTo(TEST_LEARNER_SESSION_ID)
+    assertThat(bundle).string("ed_exploration_version").isEqualTo(TEST_EXPLORATION_VERSION_STR)
+    assertThat(bundle).string("ed_state_name").isEqualTo(TEST_STATE_NAME)
+    assertThat(bundle).string("ed_ld_learner_id").isEqualTo(TEST_LEARNER_ID)
+    assertThat(bundle).string("ed_ld_install_id").isEqualTo(TEST_INSTALLATION_ID)
+    assertThat(bundle).string("from_language").isEqualTo("English")
+    assertThat(bundle).string("to_language").isEqualTo("Swahili")
+  }
+
   @Test
   fun testFillEventBundle_failedEventInstallId_studyOff_fillsOnlyNonSensitiveFieldsAndRetsName() {
     setUpTestApplicationComponentWithoutLearnerAnalyticsStudy()
@@ -1187,7 +1265,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("failed_analytics_log")
-    assertThat(bundle).hasSize(6)
+    assertThat(bundle).hasSize(9)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(INSTALL_ID_FOR_FAILED_ANALYTICS_LOG.number)
@@ -1205,7 +1283,7 @@ class KenyaAlphaEventBundleCreatorTest {
 
     val typeName = eventBundleCreator.fillEventBundle(eventLog, bundle)
     assertThat(typeName).isEqualTo("failed_analytics_log")
-    assertThat(bundle).hasSize(7)
+    assertThat(bundle).hasSize(10)
     assertThat(bundle).longInt("timestamp").isEqualTo(TEST_TIMESTAMP_1)
     assertThat(bundle).string("priority").isEqualTo("essential")
     assertThat(bundle).integer("event_type").isEqualTo(INSTALL_ID_FOR_FAILED_ANALYTICS_LOG.number)
@@ -1255,21 +1333,25 @@ class KenyaAlphaEventBundleCreatorTest {
     revisionCardContext: RevisionCardContext = createRevisionCardContext()
   ) = createEventContext(revisionCardContext, EventContextBuilder::setOpenRevisionCard)
 
+  private fun createCloseRevisionCard(
+    revisionCardContext: RevisionCardContext = createRevisionCardContext()
+  ) = createEventContext(revisionCardContext, EventContextBuilder::setCloseRevisionCard)
+
   private fun createStartCardContext(cardContext: CardContext = createCardContext()) =
     createEventContext(cardContext, EventContextBuilder::setStartCardContext)
 
   private fun createEndCardContext(cardContext: CardContext = createCardContext()) =
     createEventContext(cardContext, EventContextBuilder::setEndCardContext)
 
-  private fun createHintOfferedContext(hintContext: HintContext = createHintContext()) =
-    createEventContext(hintContext, EventContextBuilder::setHintOfferedContext)
+  private fun createHintUnlockedContext(hintContext: HintContext = createHintContext()) =
+    createEventContext(hintContext, EventContextBuilder::setHintUnlockedContext)
 
   private fun createAccessHintContext(hintContext: HintContext = createHintContext()) =
     createEventContext(hintContext, EventContextBuilder::setAccessHintContext)
 
-  private fun createSolutionOfferedContext(
+  private fun createSolutionUnlockedContext(
     explorationContext: ExplorationContext = createExplorationContext()
-  ) = createEventContext(explorationContext, EventContextBuilder::setSolutionOfferedContext)
+  ) = createEventContext(explorationContext, EventContextBuilder::setSolutionUnlockedContext)
 
   private fun createAccessSolutionContext(
     explorationContext: ExplorationContext = createExplorationContext()
@@ -1321,6 +1403,11 @@ class KenyaAlphaEventBundleCreatorTest {
   private fun createOpenProfileChooserContext() =
     createEventContext(value = true, EventContextBuilder::setOpenProfileChooser)
 
+  private fun createSwitchInLessonLanguageContext(
+    switchLanguageContext: SwitchInLessonLanguageEventContext =
+      createSwitchInLessonLanguageEventContext(),
+  ) = createEventContext(switchLanguageContext, EventContextBuilder::setSwitchInLessonLanguage)
+
   private fun createInstallationIdForFailedAnalyticsLogContext(
     installationId: String = TEST_INSTALLATION_ID
   ) = createEventContext(installationId, EventContextBuilder::setInstallIdForFailedAnalyticsLog)
@@ -1430,6 +1517,16 @@ class KenyaAlphaEventBundleCreatorTest {
     this.languageCode = languageCode
   }.build()
 
+  private fun createSwitchInLessonLanguageEventContext(
+    explorationDetails: ExplorationContext = createExplorationContext(),
+    switchFromLanguage: OppiaLanguage = OppiaLanguage.ENGLISH,
+    switchToLanguage: OppiaLanguage = OppiaLanguage.SWAHILI
+  ) = SwitchInLessonLanguageEventContext.newBuilder().apply {
+    this.explorationDetails = explorationDetails
+    this.switchFromLanguage = switchFromLanguage
+    this.switchToLanguage = switchToLanguage
+  }.build()
+
   private fun registerTestApplication() {
     val packageManager = Shadows.shadowOf(context.packageManager)
     val applicationInfo =
@@ -1442,7 +1539,7 @@ class KenyaAlphaEventBundleCreatorTest {
         .setApplicationInfo(applicationInfo)
         .build()
     packageInfo.versionName = TEST_APP_VERSION_NAME
-    packageInfo.versionCode = TEST_APP_VERSION_CODE
+    packageInfo.longVersionCode = TEST_APP_VERSION_CODE
     packageManager.installPackage(packageInfo)
   }
 

From c0dc1a51ea24a1d580aacf924a8a94996bd30df7 Mon Sep 17 00:00:00 2001
From: Ben Henning <ben@oppia.org>
Date: Mon, 30 Jan 2023 04:22:13 -0800
Subject: [PATCH 22/38] Address reviewer comments.

---
 .../drawable/secondary_button_background.xml  |  2 +-
 app/src/main/res/layout/state_fragment.xml    | 19 +++++----
 .../main/res/values-night/color_palette.xml   |  2 +-
 app/src/main/res/values/color_palette.xml     |  2 +-
 app/src/main/res/values/component_colors.xml  |  2 +-
 app/src/main/res/values/styles.xml            |  4 +-
 .../analytics/LearnerAnalyticsLogger.kt       | 13 +++---
 model/src/main/proto/oppia_logger.proto       |  9 +++--
 .../testing/logging/EventLogSubject.kt        | 40 +++++++++----------
 .../util/logging/EventBundleCreator.kt        | 18 ++++-----
 .../util/logging/EventBundleCreatorTest.kt    | 12 +++---
 .../KenyaAlphaEventBundleCreatorTest.kt       | 12 +++---
 12 files changed, 71 insertions(+), 64 deletions(-)

diff --git a/app/src/main/res/drawable/secondary_button_background.xml b/app/src/main/res/drawable/secondary_button_background.xml
index 68713c8fece..2debad327a0 100644
--- a/app/src/main/res/drawable/secondary_button_background.xml
+++ b/app/src/main/res/drawable/secondary_button_background.xml
@@ -5,5 +5,5 @@
   <solid android:color="@color/component_color_shared_white_background_color" />
   <stroke
     android:width="2dp"
-    android:color="@color/component_color_shared_secondary_button_background_color" />
+    android:color="@color/component_color_shared_secondary_button_background_trim_color" />
 </shape>
diff --git a/app/src/main/res/layout/state_fragment.xml b/app/src/main/res/layout/state_fragment.xml
index 06b50e9d13d..2e9ab7701c8 100755
--- a/app/src/main/res/layout/state_fragment.xml
+++ b/app/src/main/res/layout/state_fragment.xml
@@ -107,24 +107,26 @@
       android:clipChildren="false"
       android:clipToPadding="false"
       android:paddingTop="24dp">
+
       <FrameLayout
         android:id="@+id/quick_switch_exploration_language_button_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:layout_constraintStart_toStartOf="parent"
+        android:background="@color/component_color_shared_transparent_background_color"
+        android:visibility="@{viewModel.canQuicklyToggleBetweenSwahiliAndEnglish(viewModel.hasSwahiliTranslations, viewModel.allowInLessonQuickLanguageSwitching) ? View.VISIBLE : View.GONE}"
         app:layout_constraintBottom_toTopOf="@+id/animable_hints_and_solution_fragment_container"
-        android:background="@color/color_palette_transparent_background_color"
-        android:visibility="@{viewModel.canQuicklyToggleBetweenSwahiliAndEnglish(viewModel.hasSwahiliTranslations, viewModel.allowInLessonQuickLanguageSwitching) ? View.VISIBLE : View.GONE}">
+        app:layout_constraintStart_toStartOf="parent">
+
         <androidx.appcompat.widget.AppCompatButton
           android:id="@+id/quick_switch_exploration_language_button"
+          style="@style/SecondaryButton"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
-          style="@style/SecondaryButton"
           android:layout_margin="16dp"
           android:minWidth="@dimen/clickable_item_min_height"
           android:minHeight="@dimen/clickable_item_min_height"
-          android:text="@{viewModel.hasEnabledSwahiliTranslations ? @string/temporary_translate_to_english : @string/temporary_translate_to_swahili}"
-          android:onClick="@{(v) -> viewModel.toggleContentLanguage(viewModel.hasEnabledSwahiliTranslations)}" />
+          android:onClick="@{(v) -> viewModel.toggleContentLanguage(viewModel.hasEnabledSwahiliTranslations)}"
+          android:text="@{viewModel.hasEnabledSwahiliTranslations ? @string/temporary_translate_to_english : @string/temporary_translate_to_swahili}" />
       </FrameLayout>
 
       <FrameLayout
@@ -133,8 +135,9 @@
         android:layout_height="wrap_content"
         android:clipChildren="false"
         android:clipToPadding="false"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent">
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
         <androidx.constraintlayout.widget.ConstraintLayout
           android:id="@+id/hints_and_solution_fragment_container"
           android:layout_width="match_parent"
diff --git a/app/src/main/res/values-night/color_palette.xml b/app/src/main/res/values-night/color_palette.xml
index fa73f840d0f..c39fd1facfb 100644
--- a/app/src/main/res/values-night/color_palette.xml
+++ b/app/src/main/res/values-night/color_palette.xml
@@ -23,7 +23,7 @@
   <color name="color_palette_toolbar_shadow_color">@color/color_def_black_24</color>
   <color name="color_palette_toolbar_text_color">@color/color_def_white</color>
   <color name="color_palette_secondary_toolbar_color">@color/color_def_forest_green</color>
-  <color name="color_palette_secondary_button_background_color">@color/color_def_oppia_green</color>
+  <color name="color_palette_secondary_button_background_trim_color">@color/color_def_oppia_green</color>
   <color name="color_palette_status_bar_color">@color/color_def_dark_green</color>
   <color name="color_palette_action_bar_color">@color/color_def_oppia_green</color>
   <color name="color_palette_highlighted_background_color">@color/color_def_highlight_blue_darker</color>
diff --git a/app/src/main/res/values/color_palette.xml b/app/src/main/res/values/color_palette.xml
index 3bd9933fce5..a9e5dfa08ff 100644
--- a/app/src/main/res/values/color_palette.xml
+++ b/app/src/main/res/values/color_palette.xml
@@ -24,7 +24,7 @@
   <color name="color_palette_toolbar_shadow_color">@color/color_def_black_24</color>
   <color name="color_palette_toolbar_text_color">@color/color_def_white</color>
   <color name="color_palette_secondary_toolbar_color">@color/color_def_oppia_green</color>
-  <color name="color_palette_secondary_button_background_color">@color/color_def_oppia_green</color>
+  <color name="color_palette_secondary_button_background_trim_color">@color/color_def_oppia_green</color>
   <color name="color_palette_status_bar_color">@color/color_def_dark_green</color>
   <color name="color_palette_action_bar_color">@color/color_def_oppia_green</color>
   <color name="color_palette_highlighted_background_color">@color/color_def_highlight_blue</color>
diff --git a/app/src/main/res/values/component_colors.xml b/app/src/main/res/values/component_colors.xml
index 6211880a898..4a12778aab2 100644
--- a/app/src/main/res/values/component_colors.xml
+++ b/app/src/main/res/values/component_colors.xml
@@ -22,7 +22,7 @@
   <color name="component_color_shared_previous_responses_header_item_container_background_color">@color/color_palette_highlighted_text_color</color>
   <color name="component_color_shared_transparent_background_color">@color/color_palette_transparent_background_color</color>
   <color name="component_color_shared_white_background_color">@color/color_palette_shared_white_background_color</color>
-  <color name="component_color_shared_secondary_button_background_color">@color/color_palette_secondary_button_background_color</color>
+  <color name="component_color_shared_secondary_button_background_trim_color">@color/color_palette_secondary_button_background_trim_color</color>
   <color name="component_color_shared_hints_background_color">@color/color_palette_shared_hints_background_color</color>
   <color name="component_color_shared_previous_responses_header_item_text_color">@color/color_palette_highlighted_text_color</color>
   <color name="component_color_shared_input_interaction_edit_text_color">@color/color_palette_highlighted_text_color</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 53db1fec96e..856f9cbdf81 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -419,9 +419,9 @@
     <item name="android:background">@drawable/secondary_button_background</item>
     <item name="android:fontFamily">sans-serif-medium</item>
     <item name="android:drawablePadding">4dp</item>
-    <item name="drawableTint">@color/component_color_shared_secondary_button_background_color</item>
+    <item name="drawableTint">@color/component_color_shared_secondary_button_background_trim_color</item>
     <item name="android:textAllCaps">true</item>
-    <item name="android:textColor">@color/component_color_shared_secondary_button_background_color</item>
+    <item name="android:textColor">@color/component_color_shared_secondary_button_background_trim_color</item>
     <item name="android:textSize">14sp</item>
   </style>
   <style name="StartOverLessonButton" parent="SecondaryButton">
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 01df824adb5..59578d08aa2 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
@@ -8,8 +8,8 @@ import org.oppia.android.app.model.EventLog.CardContext
 import org.oppia.android.app.model.EventLog.ExplorationContext
 import org.oppia.android.app.model.EventLog.HintContext
 import org.oppia.android.app.model.EventLog.LearnerDetailsContext
-import org.oppia.android.app.model.EventLog.PlayVoiceOverContext
 import org.oppia.android.app.model.EventLog.SubmitAnswerContext
+import org.oppia.android.app.model.EventLog.VoiceoverActionContext
 import org.oppia.android.app.model.Exploration
 import org.oppia.android.app.model.Interaction
 import org.oppia.android.app.model.InteractionObject
@@ -404,7 +404,10 @@ class LearnerAnalyticsLogger @Inject constructor(
      */
     fun logPlayVoiceOver(contentId: String?, languageCode: String?) {
       logStateEvent(
-        contentId, languageCode, ::createPlayVoiceOverContext, EventBuilder::setPlayVoiceOverContext
+        contentId,
+        languageCode,
+        ::createVoiceoverActionContext,
+        EventBuilder::setPlayVoiceOverContext
       )
     }
 
@@ -417,7 +420,7 @@ class LearnerAnalyticsLogger @Inject constructor(
       logStateEvent(
         contentId,
         languageCode,
-        ::createPlayVoiceOverContext,
+        ::createVoiceoverActionContext,
         EventBuilder::setPauseVoiceOverContext
       )
     }
@@ -595,11 +598,11 @@ class LearnerAnalyticsLogger @Inject constructor(
       this.explorationDetails = explorationDetails
     }.build()
 
-    private fun createPlayVoiceOverContext(
+    private fun createVoiceoverActionContext(
       contentId: String?,
       languageCode: String?,
       explorationDetails: ExplorationContext
-    ) = PlayVoiceOverContext.newBuilder().apply {
+    ) = VoiceoverActionContext.newBuilder().apply {
       contentId?.let { this.contentId = it }
       languageCode?.let { this.languageCode = languageCode }
       this.explorationDetails = explorationDetails
diff --git a/model/src/main/proto/oppia_logger.proto b/model/src/main/proto/oppia_logger.proto
index 77db3474008..5346b311ecc 100644
--- a/model/src/main/proto/oppia_logger.proto
+++ b/model/src/main/proto/oppia_logger.proto
@@ -108,10 +108,10 @@ message EventLog {
       SubmitAnswerContext submit_answer_context = 22;
 
       // The event being logged is related to playing a voiceover.
-      PlayVoiceOverContext play_voice_over_context = 23;
+      VoiceoverActionContext play_voice_over_context = 23;
 
       // The event being logged is related to pausing a voiceover.
-      PlayVoiceOverContext pause_voice_over_context = 35;
+      VoiceoverActionContext pause_voice_over_context = 35;
 
       // The event being logged is related to backgrounding of the application.
       LearnerDetailsContext app_in_background_context = 24;
@@ -225,8 +225,9 @@ message EventLog {
     bool is_answer_correct = 3;
   }
 
-  // Represents the event context for playing a voiceover within an exploration.
-  message PlayVoiceOverContext {
+  // Represents the event context for performing an action pertaining to a voiceover within an
+  // exploration.
+  message VoiceoverActionContext {
     // Defined attributes that are common among other exploration related event log contexts.
     ExplorationContext exploration_details = 1;
 
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 bca42e39c80..e00c225560d 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
@@ -588,11 +588,11 @@ class EventLogSubject private constructor(
 
   /**
    * Verifies the [EventLog]'s context per [hasPlayVoiceOverContext] and returns a
-   * [PlayVoiceOverContextSubject] to test the corresponding context.
+   * [VoiceoverActionContextSubject] to test the corresponding context.
    */
-  fun hasPlayVoiceOverContextThat(): PlayVoiceOverContextSubject {
+  fun hasPlayVoiceOverContextThat(): VoiceoverActionContextSubject {
     hasPlayVoiceOverContext()
-    return PlayVoiceOverContextSubject.assertThat(actual.context.playVoiceOverContext)
+    return VoiceoverActionContextSubject.assertThat(actual.context.playVoiceOverContext)
   }
 
   /**
@@ -600,7 +600,7 @@ class EventLogSubject private constructor(
    * [hasOpenExplorationActivityContextThat] except for the conditions of, and subject returned by,
    * [hasPlayVoiceOverContextThat].
    */
-  fun hasPlayVoiceOverContextThat(block: PlayVoiceOverContextSubject.() -> Unit) {
+  fun hasPlayVoiceOverContextThat(block: VoiceoverActionContextSubject.() -> Unit) {
     hasPlayVoiceOverContextThat().block()
   }
 
@@ -614,11 +614,11 @@ class EventLogSubject private constructor(
 
   /**
    * Verifies the [EventLog]'s context per [hasPauseVoiceOverContext] and returns a
-   * [PlayVoiceOverContextSubject] to test the corresponding context.
+   * [VoiceoverActionContextSubject] to test the corresponding context.
    */
-  fun hasPauseVoiceOverContextThat(): PlayVoiceOverContextSubject {
+  fun hasPauseVoiceOverContextThat(): VoiceoverActionContextSubject {
     hasPauseVoiceOverContext()
-    return PlayVoiceOverContextSubject.assertThat(actual.context.pauseVoiceOverContext)
+    return VoiceoverActionContextSubject.assertThat(actual.context.pauseVoiceOverContext)
   }
 
   /**
@@ -626,7 +626,7 @@ class EventLogSubject private constructor(
    * [hasOpenExplorationActivityContextThat] except for the conditions of, and subject returned by,
    * [hasPauseVoiceOverContextThat].
    */
-  fun hasPauseVoiceOverContextThat(block: PlayVoiceOverContextSubject.() -> Unit) {
+  fun hasPauseVoiceOverContextThat(block: VoiceoverActionContextSubject.() -> Unit) {
     hasPauseVoiceOverContextThat().block()
   }
 
@@ -1318,20 +1318,20 @@ class EventLogSubject private constructor(
   }
 
   /**
-   * Truth subject for verifying properties of [EventLog.PlayVoiceOverContext]s.
+   * Truth subject for verifying properties of [EventLog.VoiceoverActionContext]s.
    *
    * Note that this class is also a [LiteProtoSubject] so other aspects of the underlying
-   * [EventLog.PlayVoiceOverContext] proto can be verified through inherited methods.
+   * [EventLog.VoiceoverActionContext] proto can be verified through inherited methods.
    *
-   * Call [PlayVoiceOverContextSubject.assertThat] to create the subject.
+   * Call [VoiceoverActionContextSubject.assertThat] to create the subject.
    */
-  class PlayVoiceOverContextSubject private constructor(
+  class VoiceoverActionContextSubject private constructor(
     metadata: FailureMetadata,
-    private val actual: EventLog.PlayVoiceOverContext
+    private val actual: EventLog.VoiceoverActionContext
   ) : LiteProtoSubject(metadata, actual) {
     /**
      * Returns a [ExplorationContextSubject] to test
-     * [EventLog.PlayVoiceOverContext.getExplorationDetails].
+     * [EventLog.VoiceoverActionContext.getExplorationDetails].
      *
      * This method never fails since the underlying property defaults to empty proto if it's not
      * defined in the context.
@@ -1348,7 +1348,7 @@ class EventLogSubject private constructor(
     }
 
     /**
-     * Returns a [StringSubject] to test [EventLog.PlayVoiceOverContext.getContentId].
+     * Returns a [StringSubject] to test [EventLog.VoiceoverActionContext.getContentId].
      *
      * This method never fails since the underlying property defaults to empty string if it's not
      * defined in the context.
@@ -1356,7 +1356,7 @@ class EventLogSubject private constructor(
     fun hasContentIdThat(): StringSubject = assertThat(actual.contentId)
 
     /**
-     * Returns a [StringSubject] to test [EventLog.PlayVoiceOverContext.getLanguageCode].
+     * Returns a [StringSubject] to test [EventLog.VoiceoverActionContext.getLanguageCode].
      *
      * This method never fails since the underlying property defaults to empty string if it's not
      * defined in the context.
@@ -1365,11 +1365,11 @@ class EventLogSubject private constructor(
 
     companion object {
       /**
-       * Returns a new [PlayVoiceOverContextSubject] to verify aspects of the specified
-       * [EventLog.PlayVoiceOverContext] value.
+       * Returns a new [VoiceoverActionContextSubject] to verify aspects of the specified
+       * [EventLog.VoiceoverActionContext] value.
        */
-      fun assertThat(actual: EventLog.PlayVoiceOverContext): PlayVoiceOverContextSubject =
-        assertAbout(::PlayVoiceOverContextSubject).that(actual)
+      fun assertThat(actual: EventLog.VoiceoverActionContext): VoiceoverActionContextSubject =
+        assertAbout(::VoiceoverActionContextSubject).that(actual)
     }
   }
 
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 00516da71ce..035daaa66b5 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
@@ -59,7 +59,6 @@ import org.oppia.android.util.logging.EventBundleCreator.EventActivityContext.Em
 import org.oppia.android.util.logging.EventBundleCreator.EventActivityContext.ExplorationContext
 import org.oppia.android.util.logging.EventBundleCreator.EventActivityContext.HintContext
 import org.oppia.android.util.logging.EventBundleCreator.EventActivityContext.LearnerDetailsContext
-import org.oppia.android.util.logging.EventBundleCreator.EventActivityContext.PlayPauseVoiceOverContext
 import org.oppia.android.util.logging.EventBundleCreator.EventActivityContext.QuestionContext
 import org.oppia.android.util.logging.EventBundleCreator.EventActivityContext.RevisionCardContext
 import org.oppia.android.util.logging.EventBundleCreator.EventActivityContext.SensitiveStringContext
@@ -67,6 +66,7 @@ import org.oppia.android.util.logging.EventBundleCreator.EventActivityContext.St
 import org.oppia.android.util.logging.EventBundleCreator.EventActivityContext.SubmitAnswerContext
 import org.oppia.android.util.logging.EventBundleCreator.EventActivityContext.SwitchInLessonLanguageContext
 import org.oppia.android.util.logging.EventBundleCreator.EventActivityContext.TopicContext
+import org.oppia.android.util.logging.EventBundleCreator.EventActivityContext.VoiceoverActionContext
 import org.oppia.android.util.logging.EventBundleCreator.PerformanceMetricsLoggableMetricType.ApkSizeLoggableMetric
 import org.oppia.android.util.logging.EventBundleCreator.PerformanceMetricsLoggableMetricType.CpuUsageLoggableMetric
 import org.oppia.android.util.logging.EventBundleCreator.PerformanceMetricsLoggableMetricType.MemoryUsageLoggableMetric
@@ -82,12 +82,12 @@ import org.oppia.android.app.model.EventLog.ConceptCardContext as ConceptCardEve
 import org.oppia.android.app.model.EventLog.ExplorationContext as ExplorationEventContext
 import org.oppia.android.app.model.EventLog.HintContext as HintEventContext
 import org.oppia.android.app.model.EventLog.LearnerDetailsContext as LearnerDetailsEventContext
-import org.oppia.android.app.model.EventLog.PlayVoiceOverContext as PlayVoiceOverEventContext
 import org.oppia.android.app.model.EventLog.QuestionContext as QuestionEventContext
 import org.oppia.android.app.model.EventLog.RevisionCardContext as RevisionCardEventContext
 import org.oppia.android.app.model.EventLog.StoryContext as StoryEventContext
 import org.oppia.android.app.model.EventLog.SubmitAnswerContext as SubmitAnswerEventContext
 import org.oppia.android.app.model.EventLog.TopicContext as TopicEventContext
+import org.oppia.android.app.model.EventLog.VoiceoverActionContext as VoiceoverActionEventContext
 import org.oppia.android.app.model.OppiaMetricLog.ApkSizeMetric as ApkSizePerformanceLoggableMetric
 import org.oppia.android.app.model.OppiaMetricLog.CpuUsageMetric as CpuUsagePerformanceLoggableMetric
 import org.oppia.android.app.model.OppiaMetricLog.MemoryUsageMetric as MemoryUsagePerformanceLoggableMetric
@@ -187,8 +187,8 @@ class EventBundleCreator @Inject constructor(
       SOLUTION_UNLOCKED_CONTEXT -> ExplorationContext(activityName, solutionUnlockedContext)
       ACCESS_SOLUTION_CONTEXT -> ExplorationContext(activityName, accessSolutionContext)
       SUBMIT_ANSWER_CONTEXT -> SubmitAnswerContext(activityName, submitAnswerContext)
-      PLAY_VOICE_OVER_CONTEXT -> PlayPauseVoiceOverContext(activityName, playVoiceOverContext)
-      PAUSE_VOICE_OVER_CONTEXT -> PlayPauseVoiceOverContext(activityName, pauseVoiceOverContext)
+      PLAY_VOICE_OVER_CONTEXT -> VoiceoverActionContext(activityName, playVoiceOverContext)
+      PAUSE_VOICE_OVER_CONTEXT -> VoiceoverActionContext(activityName, pauseVoiceOverContext)
       APP_IN_BACKGROUND_CONTEXT -> LearnerDetailsContext(activityName, appInBackgroundContext)
       APP_IN_FOREGROUND_CONTEXT -> LearnerDetailsContext(activityName, appInForegroundContext)
       EXIT_EXPLORATION_CONTEXT -> ExplorationContext(activityName, exitExplorationContext)
@@ -389,12 +389,12 @@ class EventBundleCreator @Inject constructor(
       }
     }
 
-    /** The [EventActivityContext] corresponding to [PlayVoiceOverEventContext]s. */
-    class PlayPauseVoiceOverContext(
+    /** The [EventActivityContext] corresponding to [VoiceoverActionEventContext]s. */
+    class VoiceoverActionContext(
       activityName: String,
-      value: PlayVoiceOverEventContext
-    ) : EventActivityContext<PlayVoiceOverEventContext>(activityName, value) {
-      override fun PlayVoiceOverEventContext.storeValue(store: PropertyStore) {
+      value: VoiceoverActionEventContext
+    ) : EventActivityContext<VoiceoverActionEventContext>(activityName, value) {
+      override fun VoiceoverActionEventContext.storeValue(store: PropertyStore) {
         store.putProperties("exploration_details", explorationDetails, ::ExplorationContext)
         store.putNonSensitiveValue("content_id", contentId)
         store.putNonSensitiveValue("language_code", languageCode)
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 db170978df5..b1fa6410ad9 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
@@ -55,7 +55,6 @@ import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.SWITCH_I
 import org.oppia.android.app.model.EventLog.ExplorationContext
 import org.oppia.android.app.model.EventLog.HintContext
 import org.oppia.android.app.model.EventLog.LearnerDetailsContext
-import org.oppia.android.app.model.EventLog.PlayVoiceOverContext
 import org.oppia.android.app.model.EventLog.Priority.ESSENTIAL
 import org.oppia.android.app.model.EventLog.Priority.OPTIONAL
 import org.oppia.android.app.model.EventLog.QuestionContext
@@ -64,6 +63,7 @@ import org.oppia.android.app.model.EventLog.StoryContext
 import org.oppia.android.app.model.EventLog.SubmitAnswerContext
 import org.oppia.android.app.model.EventLog.SwitchInLessonLanguageEventContext
 import org.oppia.android.app.model.EventLog.TopicContext
+import org.oppia.android.app.model.EventLog.VoiceoverActionContext
 import org.oppia.android.app.model.OppiaLanguage
 import org.oppia.android.app.model.OppiaMetricLog
 import org.oppia.android.app.model.OppiaMetricLog.LoggableMetric
@@ -2091,12 +2091,12 @@ class EventBundleCreatorTest {
   ) = createEventContext(submitAnswerContext, EventContextBuilder::setSubmitAnswerContext)
 
   private fun createPlayVoiceOverContext(
-    playVoiceOverContext: PlayVoiceOverContext = createPlayVoiceOverContextDetails()
+    playVoiceOverContext: VoiceoverActionContext = createPlayVoiceOverContextDetails()
   ) = createEventContext(playVoiceOverContext, EventContextBuilder::setPlayVoiceOverContext)
 
   private fun createPauseVoiceOverContext(
-    playVoiceOverContext: PlayVoiceOverContext = createPauseVoiceOverContextDetails()
-  ) = createEventContext(playVoiceOverContext, EventContextBuilder::setPauseVoiceOverContext)
+    pauseVoiceOverContext: VoiceoverActionContext = createPauseVoiceOverContextDetails()
+  ) = createEventContext(pauseVoiceOverContext, EventContextBuilder::setPauseVoiceOverContext)
 
   private fun createAppInBackgroundContext(
     learnerDetails: LearnerDetailsContext = createLearnerDetailsContext()
@@ -2234,7 +2234,7 @@ class EventBundleCreatorTest {
     explorationDetails: ExplorationContext = createExplorationContext(),
     contentId: String = TEST_CONTENT_ID,
     languageCode: String = TEST_LANGUAGE_CODE
-  ) = PlayVoiceOverContext.newBuilder().apply {
+  ) = VoiceoverActionContext.newBuilder().apply {
     this.explorationDetails = explorationDetails
     this.contentId = contentId
     this.languageCode = languageCode
@@ -2244,7 +2244,7 @@ class EventBundleCreatorTest {
     explorationDetails: ExplorationContext = createExplorationContext(),
     contentId: String = TEST_CONTENT_ID,
     languageCode: String = TEST_LANGUAGE_CODE
-  ) = PlayVoiceOverContext.newBuilder().apply {
+  ) = VoiceoverActionContext.newBuilder().apply {
     this.explorationDetails = explorationDetails
     this.contentId = contentId
     this.languageCode = languageCode
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 6b96bf30a4d..ff7a8196882 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
@@ -53,7 +53,6 @@ import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.SWITCH_I
 import org.oppia.android.app.model.EventLog.ExplorationContext
 import org.oppia.android.app.model.EventLog.HintContext
 import org.oppia.android.app.model.EventLog.LearnerDetailsContext
-import org.oppia.android.app.model.EventLog.PlayVoiceOverContext
 import org.oppia.android.app.model.EventLog.Priority.ESSENTIAL
 import org.oppia.android.app.model.EventLog.Priority.OPTIONAL
 import org.oppia.android.app.model.EventLog.QuestionContext
@@ -62,6 +61,7 @@ import org.oppia.android.app.model.EventLog.StoryContext
 import org.oppia.android.app.model.EventLog.SubmitAnswerContext
 import org.oppia.android.app.model.EventLog.SwitchInLessonLanguageEventContext
 import org.oppia.android.app.model.EventLog.TopicContext
+import org.oppia.android.app.model.EventLog.VoiceoverActionContext
 import org.oppia.android.app.model.OppiaLanguage
 import org.oppia.android.util.platformparameter.EnableLearnerStudyAnalytics
 import org.oppia.android.util.platformparameter.LEARNER_STUDY_ANALYTICS_DEFAULT_VALUE
@@ -1362,12 +1362,12 @@ class KenyaAlphaEventBundleCreatorTest {
   ) = createEventContext(submitAnswerContext, EventContextBuilder::setSubmitAnswerContext)
 
   private fun createPlayVoiceOverContext(
-    playVoiceOverContext: PlayVoiceOverContext = createPlayVoiceOverContextDetails()
+    playVoiceOverContext: VoiceoverActionContext = createPlayVoiceOverContextDetails()
   ) = createEventContext(playVoiceOverContext, EventContextBuilder::setPlayVoiceOverContext)
 
   private fun createPauseVoiceOverContext(
-    playVoiceOverContext: PlayVoiceOverContext = createPauseVoiceOverContextDetails()
-  ) = createEventContext(playVoiceOverContext, EventContextBuilder::setPauseVoiceOverContext)
+    pauseVoiceOverContext: VoiceoverActionContext = createPauseVoiceOverContextDetails()
+  ) = createEventContext(pauseVoiceOverContext, EventContextBuilder::setPauseVoiceOverContext)
 
   private fun createAppInBackgroundContext(
     learnerDetails: LearnerDetailsContext = createLearnerDetailsContext()
@@ -1501,7 +1501,7 @@ class KenyaAlphaEventBundleCreatorTest {
     explorationDetails: ExplorationContext = createExplorationContext(),
     contentId: String = TEST_CONTENT_ID,
     languageCode: String = TEST_LANGUAGE_CODE
-  ) = PlayVoiceOverContext.newBuilder().apply {
+  ) = VoiceoverActionContext.newBuilder().apply {
     this.explorationDetails = explorationDetails
     this.contentId = contentId
     this.languageCode = languageCode
@@ -1511,7 +1511,7 @@ class KenyaAlphaEventBundleCreatorTest {
     explorationDetails: ExplorationContext = createExplorationContext(),
     contentId: String = TEST_CONTENT_ID,
     languageCode: String = TEST_LANGUAGE_CODE
-  ) = PlayVoiceOverContext.newBuilder().apply {
+  ) = VoiceoverActionContext.newBuilder().apply {
     this.explorationDetails = explorationDetails
     this.contentId = contentId
     this.languageCode = languageCode

From 6eaa68caef47e6eca8589b6eca8bb2e0d79dde3a Mon Sep 17 00:00:00 2001
From: Ben Henning <ben@oppia.org>
Date: Mon, 30 Jan 2023 05:00:48 -0800
Subject: [PATCH 23/38] Use latest commit for versioning, instead.

Also, bump version codes to prepare for another Kenya-specific alpha
re-release.
---
 .../scripts/build/TransformAndroidManifest.kt |  2 +-
 .../oppia/android/scripts/common/GitClient.kt |  7 ++++
 .../build/TransformAndroidManifestTest.kt     | 15 +++++++-
 .../android/scripts/common/GitClientTest.kt   | 36 +++++++++++++++++++
 version.bzl                                   | 14 ++++----
 5 files changed, 65 insertions(+), 9 deletions(-)

diff --git a/scripts/src/java/org/oppia/android/scripts/build/TransformAndroidManifest.kt b/scripts/src/java/org/oppia/android/scripts/build/TransformAndroidManifest.kt
index 51732748d68..4fde91e42eb 100644
--- a/scripts/src/java/org/oppia/android/scripts/build/TransformAndroidManifest.kt
+++ b/scripts/src/java/org/oppia/android/scripts/build/TransformAndroidManifest.kt
@@ -108,7 +108,7 @@ private class TransformAndroidManifest(
     }
     val versionNameAttribute = manifestDocument.createAttribute("android:versionName").apply {
       value = computeVersionName(
-        buildFlavor, majorVersion, minorVersion, commitHash = gitClient.branchMergeBase
+        buildFlavor, majorVersion, minorVersion, commitHash = gitClient.currentCommit
       )
     }
     val applicationNameAttribute = manifestDocument.createAttribute("android:name").apply {
diff --git a/scripts/src/java/org/oppia/android/scripts/common/GitClient.kt b/scripts/src/java/org/oppia/android/scripts/common/GitClient.kt
index 4da3ddb49cd..797d345bbf2 100644
--- a/scripts/src/java/org/oppia/android/scripts/common/GitClient.kt
+++ b/scripts/src/java/org/oppia/android/scripts/common/GitClient.kt
@@ -13,6 +13,9 @@ class GitClient(
 ) {
   private val commandExecutor by lazy { CommandExecutorImpl() }
 
+  /** The commit hash of the HEAD of the local Git repository. */
+  val currentCommit: String by lazy { retrieveCurrentCommit() }
+
   /** The name of the current branch of the local Git repository. */
   val currentBranch: String by lazy { retrieveCurrentBranch() }
 
@@ -25,6 +28,10 @@ class GitClient(
    */
   val changedFiles: Set<String> by lazy { retrieveChangedFilesWithPotentialDuplicates().toSet() }
 
+  private fun retrieveCurrentCommit(): String {
+    return executeGitCommandWithOneLineOutput("rev-parse HEAD")
+  }
+
   private fun retrieveCurrentBranch(): String {
     return executeGitCommandWithOneLineOutput("rev-parse --abbrev-ref HEAD")
   }
diff --git a/scripts/src/javatests/org/oppia/android/scripts/build/TransformAndroidManifestTest.kt b/scripts/src/javatests/org/oppia/android/scripts/build/TransformAndroidManifestTest.kt
index fadf3154983..424d22b661f 100644
--- a/scripts/src/javatests/org/oppia/android/scripts/build/TransformAndroidManifestTest.kt
+++ b/scripts/src/javatests/org/oppia/android/scripts/build/TransformAndroidManifestTest.kt
@@ -58,6 +58,7 @@ class TransformAndroidManifestTest {
   @JvmField
   var tempFolder = TemporaryFolder()
 
+  private val commandExecutor by lazy { CommandExecutorImpl() }
   private lateinit var testGitRepository: TestGitRepository
 
   @Before
@@ -349,6 +350,11 @@ class TransformAndroidManifestTest {
     val manifestFile = tempFolder.newFile(TEST_MANIFEST_FILE_NAME).apply {
       writeText(TEST_MANIFEST_CONTENT_WITHOUT_VERSIONS)
     }
+    // Use a separate branch to ensure the version uses the latest commit rather than the common
+    // merge base with the develop branch.
+    testGitRepository.checkoutNewBranch("release-branch")
+    testGitRepository.commit(message = "Release-only commit, e.g. a cherry-pick", allowEmpty = true)
+    val latestCommit = getMostRecentCommitOnCurrentBranch()
 
     runScript(
       tempFolder.root.absolutePath,
@@ -367,7 +373,7 @@ class TransformAndroidManifestTest {
     assertThat(transformedManifest)
       .containsMatch(
         "android:versionName=\"$MAJOR_VERSION\\.$MINOR_VERSION" +
-          "-$BUILD_FLAVOR-[a-f0-9]{10}\""
+          "-$BUILD_FLAVOR-${latestCommit.take(10)}\""
       )
     assertThat(transformedManifest)
       .containsMatch("<application android:name=\"$APPLICATION_RELATIVE_QUALIFIED_CLASS\"")
@@ -386,4 +392,11 @@ class TransformAndroidManifestTest {
     testGitRepository.checkoutNewBranch("develop")
     testGitRepository.commit(message = "Initial commit.", allowEmpty = true)
   }
+
+  private fun getMostRecentCommitOnCurrentBranch(): String {
+    // See https://stackoverflow.com/a/949391 for a reference to validate that this is correct.
+    return commandExecutor.executeCommand(
+      tempFolder.root, "git", "rev-parse", "HEAD"
+    ).output.single()
+  }
 }
diff --git a/scripts/src/javatests/org/oppia/android/scripts/common/GitClientTest.kt b/scripts/src/javatests/org/oppia/android/scripts/common/GitClientTest.kt
index 0ec570a1225..9362d7dd006 100644
--- a/scripts/src/javatests/org/oppia/android/scripts/common/GitClientTest.kt
+++ b/scripts/src/javatests/org/oppia/android/scripts/common/GitClientTest.kt
@@ -40,6 +40,42 @@ class GitClientTest {
     println(testGitRepository.status())
   }
 
+  @Test
+  fun testCurrentCommit_forNonRepository_throwsException() {
+    val gitClient = GitClient(tempFolder.root, "develop")
+
+    val exception = assertThrows(IllegalStateException::class) { gitClient.currentCommit }
+
+    assertThat(exception).hasMessageThat().contains("Expected non-zero exit code")
+    assertThat(exception).hasMessageThat().ignoringCase().contains("not a git repository")
+  }
+
+  @Test
+  fun testCurrentCommit_forValidRepository_returnsCorrectBranch() {
+    initializeRepoWithDevelopBranch()
+    val developHash = getMostRecentCommitOnCurrentBranch()
+
+    val gitClient = GitClient(tempFolder.root, "develop")
+    val currentCommit = gitClient.currentCommit
+
+    assertThat(currentCommit).isEqualTo(developHash)
+  }
+
+  @Test
+  fun testCurrentCommit_switchBranch_returnsCorrectBranch() {
+    initializeRepoWithDevelopBranch()
+    val developHash = getMostRecentCommitOnCurrentBranch()
+    testGitRepository.checkoutNewBranch("introduce-feature")
+    testGitRepository.commit(message = "Test empty commit", allowEmpty = true)
+    val featureBranchHash = getMostRecentCommitOnCurrentBranch()
+
+    val gitClient = GitClient(tempFolder.root, "develop")
+    val currentCommit = gitClient.currentCommit
+
+    assertThat(currentCommit).isNotEqualTo(developHash)
+    assertThat(currentCommit).isEqualTo(featureBranchHash)
+  }
+
   @Test
   fun testCurrentBranch_forNonRepository_throwsException() {
     val gitClient = GitClient(tempFolder.root, "develop")
diff --git a/version.bzl b/version.bzl
index 2e1ca0aa781..216ee80ed8c 100644
--- a/version.bzl
+++ b/version.bzl
@@ -10,10 +10,10 @@ MAJOR_VERSION = 0
 MINOR_VERSION = 10
 
 # TODO(#4419): Remove the Kenya-specific alpha version code.
-OPPIA_DEV_KITKAT_VERSION_CODE = 61
-OPPIA_DEV_VERSION_CODE = 60
-OPPIA_ALPHA_KITKAT_VERSION_CODE = 59
-OPPIA_ALPHA_VERSION_CODE = 58
-OPPIA_ALPHA_KENYA_VERSION_CODE = 57
-OPPIA_BETA_VERSION_CODE = 56
-OPPIA_GA_VERSION_CODE = 55
+OPPIA_DEV_KITKAT_VERSION_CODE = 68
+OPPIA_DEV_VERSION_CODE = 67
+OPPIA_ALPHA_KITKAT_VERSION_CODE = 66
+OPPIA_ALPHA_VERSION_CODE = 65
+OPPIA_ALPHA_KENYA_VERSION_CODE = 64
+OPPIA_BETA_VERSION_CODE = 63
+OPPIA_GA_VERSION_CODE = 62

From a64d1a20b57d4825898de2a44fcebd36b07eb162 Mon Sep 17 00:00:00 2001
From: Ben Henning <ben@oppia.org>
Date: Mon, 30 Jan 2023 06:36:00 -0800
Subject: [PATCH 24/38] Fix broken tests.

Includes one small clean-up.
---
 .../ProfileAndDeviceIdActivityTest.kt         |   2 +-
 .../devoptions/ViewEventLogsFragmentTest.kt   |  45 ++++---
 .../android/app/home/HomeActivityLocalTest.kt |   9 +-
 .../parser/ListItemLeadingMarginSpanTest.kt   | 111 ++++++------------
 .../ProfileChooserFragmentLocalTest.kt        |   9 +-
 .../app/story/StoryActivityLocalTest.kt       |   9 +-
 .../topic/info/TopicInfoFragmentLocalTest.kt  |   9 +-
 .../lessons/TopicLessonsFragmentLocalTest.kt  |   9 +-
 .../RevisionCardActivityLocalTest.kt          |  11 +-
 .../domain/oppialogger/OppiaLoggerTest.kt     |   9 +-
 .../ApplicationLifecycleModuleTest.kt         |   4 +-
 .../ApplicationLifecycleObserverTest.kt       |   3 +-
 .../domain/oppialogger/analytics/BUILD.bazel  |   2 +
 .../topic/StoryProgressControllerTest.kt      |   3 +-
 .../testing/profile/ProfileTestHelperTest.kt  |  13 +-
 15 files changed, 111 insertions(+), 137 deletions(-)

diff --git a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdActivityTest.kt
index 217cdcf4a56..6f1c1633eb9 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdActivityTest.kt
@@ -175,7 +175,7 @@ class ProfileAndDeviceIdActivityTest {
   fun testActivity_withOnlyAdminProfile_hasOneProfileListed() {
     // Verify that the fragment has actually loaded by checking to make sure there are items listed
     // in its recycler view.
-    onView(withId(R.id.profile_and_device_id_recycler_view)).check(hasItemCount(count = 3))
+    onView(withId(R.id.profile_and_device_id_recycler_view)).check(hasItemCount(count = 4))
   }
 
   private fun setUpTestApplicationComponent() {
diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/ViewEventLogsFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/ViewEventLogsFragmentTest.kt
index 5b5150fbea6..7a55bc414d4 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/ViewEventLogsFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/ViewEventLogsFragmentTest.kt
@@ -62,6 +62,7 @@ import org.oppia.android.domain.onboarding.ExpirationMetaDataRetrieverModule
 import org.oppia.android.domain.oppialogger.LogStorageModule
 import org.oppia.android.domain.oppialogger.LoggingIdentifierModule
 import org.oppia.android.domain.oppialogger.OppiaLogger
+import org.oppia.android.domain.oppialogger.analytics.AnalyticsController
 import org.oppia.android.domain.oppialogger.analytics.ApplicationLifecycleModule
 import org.oppia.android.domain.oppialogger.analytics.CpuPerformanceSnapshotterModule
 import org.oppia.android.domain.oppialogger.logscheduler.MetricLogSchedulerModule
@@ -113,23 +114,14 @@ private const val TEST_SUB_TOPIC_ID = 1
   qualifiers = "port-xxhdpi"
 )
 class ViewEventLogsFragmentTest {
-  @get:Rule
-  val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
+  @get:Rule val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
+  @get:Rule val oppiaTestRule = OppiaTestRule()
 
-  @get:Rule
-  val oppiaTestRule = OppiaTestRule()
-
-  @Inject
-  lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
-
-  @Inject
-  lateinit var context: Context
-
-  @Inject
-  lateinit var oppiaLogger: OppiaLogger
-
-  @Inject
-  lateinit var fakeOppiaClock: FakeOppiaClock
+  @Inject lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
+  @Inject lateinit var context: Context
+  @Inject lateinit var oppiaLogger: OppiaLogger
+  @Inject lateinit var analyticsController: AnalyticsController
+  @Inject lateinit var fakeOppiaClock: FakeOppiaClock
 
   @Before
   fun setUp() {
@@ -137,6 +129,7 @@ class ViewEventLogsFragmentTest {
     testCoroutineDispatchers.registerIdlingResource()
     fakeOppiaClock.setFakeTimeMode(FakeOppiaClock.FakeTimeMode.MODE_FIXED_FAKE_TIME)
     logMultipleEvents()
+    testCoroutineDispatchers.runCurrent()
   }
 
   @After
@@ -489,22 +482,28 @@ class ViewEventLogsFragmentTest {
   /** Logs multiple event logs so that the recyclerview in [ViewEventLogsFragment] gets populated */
   private fun logMultipleEvents() {
     fakeOppiaClock.setCurrentTimeMs(TEST_TIMESTAMP)
-    oppiaLogger.logImportantEvent(oppiaLogger.createOpenProfileChooserContext())
+    analyticsController.logImportantEvent(
+      oppiaLogger.createOpenProfileChooserContext(), profileId = null
+    )
 
     fakeOppiaClock.setCurrentTimeMs(TEST_TIMESTAMP + 10000)
-    oppiaLogger.logImportantEvent(eventContext = oppiaLogger.createOpenHomeContext())
+    analyticsController.logImportantEvent(
+      eventContext = oppiaLogger.createOpenHomeContext(), profileId = null
+    )
 
     fakeOppiaClock.setCurrentTimeMs(TEST_TIMESTAMP + 20000)
-    oppiaLogger.logImportantEvent(oppiaLogger.createOpenLessonsTabContext(TEST_TOPIC_ID))
+    analyticsController.logImportantEvent(
+      oppiaLogger.createOpenLessonsTabContext(TEST_TOPIC_ID), profileId = null
+    )
 
     fakeOppiaClock.setCurrentTimeMs(TEST_TIMESTAMP + 30000)
-    oppiaLogger.logImportantEvent(
-      oppiaLogger.createOpenStoryActivityContext(TEST_TOPIC_ID, TEST_STORY_ID)
+    analyticsController.logImportantEvent(
+      oppiaLogger.createOpenStoryActivityContext(TEST_TOPIC_ID, TEST_STORY_ID), profileId = null
     )
 
     fakeOppiaClock.setCurrentTimeMs(TEST_TIMESTAMP + 40000)
-    oppiaLogger.logImportantEvent(
-      oppiaLogger.createOpenRevisionCardContext(TEST_TOPIC_ID, TEST_SUB_TOPIC_ID)
+    analyticsController.logImportantEvent(
+      oppiaLogger.createOpenRevisionCardContext(TEST_TOPIC_ID, TEST_SUB_TOPIC_ID), profileId = null
     )
   }
 
diff --git a/app/src/test/java/org/oppia/android/app/home/HomeActivityLocalTest.kt b/app/src/test/java/org/oppia/android/app/home/HomeActivityLocalTest.kt
index 8681ad00813..ace60d9a326 100644
--- a/app/src/test/java/org/oppia/android/app/home/HomeActivityLocalTest.kt
+++ b/app/src/test/java/org/oppia/android/app/home/HomeActivityLocalTest.kt
@@ -66,6 +66,7 @@ import org.oppia.android.testing.FakeAnalyticsEventLogger
 import org.oppia.android.testing.TestLogReportingModule
 import org.oppia.android.testing.junit.InitializeDefaultLocaleRule
 import org.oppia.android.testing.robolectric.RobolectricModule
+import org.oppia.android.testing.threading.TestCoroutineDispatchers
 import org.oppia.android.testing.threading.TestDispatcherModule
 import org.oppia.android.testing.time.FakeOppiaClockModule
 import org.oppia.android.util.accessibility.AccessibilityTestModule
@@ -94,11 +95,10 @@ import javax.inject.Singleton
   qualifiers = "port-xxhdpi"
 )
 class HomeActivityLocalTest {
-  @get:Rule
-  val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
+  @get:Rule val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
 
-  @Inject
-  lateinit var fakeAnalyticsEventLogger: FakeAnalyticsEventLogger
+  @Inject lateinit var fakeAnalyticsEventLogger: FakeAnalyticsEventLogger
+  @Inject lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
 
   private val internalProfileId: Int = 1
 
@@ -116,6 +116,7 @@ class HomeActivityLocalTest {
   @Test
   fun testHomeActivity_onLaunch_logsEvent() {
     launch<HomeActivity>(createHomeActivityIntent(internalProfileId)).use {
+      testCoroutineDispatchers.runCurrent()
       val event = fakeAnalyticsEventLogger.getMostRecentEvent()
 
       assertThat(event.priority).isEqualTo(EventLog.Priority.ESSENTIAL)
diff --git a/app/src/test/java/org/oppia/android/app/parser/ListItemLeadingMarginSpanTest.kt b/app/src/test/java/org/oppia/android/app/parser/ListItemLeadingMarginSpanTest.kt
index 61da905af84..b7515853e05 100644
--- a/app/src/test/java/org/oppia/android/app/parser/ListItemLeadingMarginSpanTest.kt
+++ b/app/src/test/java/org/oppia/android/app/parser/ListItemLeadingMarginSpanTest.kt
@@ -133,28 +133,15 @@ class ListItemLeadingMarginSpanTest {
   private val initializeDefaultLocaleRule by lazy { InitializeDefaultLocaleRule() }
 
   @Inject lateinit var machineLocale: OppiaLocale.MachineLocale
-
   @Inject lateinit var androidLocaleFactory: AndroidLocaleFactory
-
   @Inject lateinit var formatterFactory: OppiaBidiFormatter.Factory
-
   @Inject lateinit var htmlParserFactory: HtmlParser.Factory
-
   @Inject lateinit var context: Context
-
   @Inject lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
 
-  private val bulletRadius by lazy {
-    context.resources.getDimensionPixelSize(org.oppia.android.util.R.dimen.bullet_radius)
-  }
   private val spacingBeforeText by lazy {
     context.resources.getDimensionPixelSize(org.oppia.android.util.R.dimen.spacing_before_text)
   }
-  private val spacingBeforeNumberedText by lazy {
-    context.resources.getDimensionPixelSize(
-      org.oppia.android.util.R.dimen.spacing_before_numbered_text
-    )
-  }
 
   @Inject
   lateinit var appLanguageLocaleHandler: AppLanguageLocaleHandler
@@ -222,15 +209,13 @@ class ListItemLeadingMarginSpanTest {
 
     val bulletSpan0 = bulletSpans[0] as ListItemLeadingMarginSpan.UlSpan
 
-    val expectedMargin = 2 * bulletRadius + spacingBeforeText
-
     val bulletSpan0Margin = bulletSpan0.getLeadingMargin(true)
-    assertThat(bulletSpan0Margin).isEqualTo(expectedMargin)
+    assertThat(bulletSpan0Margin).isEqualTo(66)
 
     val bulletSpan1 = bulletSpans[1] as ListItemLeadingMarginSpan.UlSpan
 
     val bulletSpan1Margin = bulletSpan1.getLeadingMargin(true)
-    assertThat(bulletSpan1Margin).isEqualTo(expectedMargin)
+    assertThat(bulletSpan1Margin).isEqualTo(66)
   }
 
   @Test
@@ -275,16 +260,14 @@ class ListItemLeadingMarginSpanTest {
       )
     assertThat(bulletSpans.size.toLong()).isEqualTo(5)
 
-    val expectedMargin = 2 * bulletRadius + spacingBeforeText
-
     val bulletSpan0 = bulletSpans[0] as ListItemLeadingMarginSpan.UlSpan
     val bulletSpan0Margin = bulletSpan0.getLeadingMargin(true)
-    assertThat(bulletSpan0Margin).isEqualTo(expectedMargin)
+    assertThat(bulletSpan0Margin).isEqualTo(66)
 
     val bulletSpan1 = bulletSpans[1] as ListItemLeadingMarginSpan.UlSpan
 
     val bulletSpan1Margin = bulletSpan1.getLeadingMargin(true)
-    assertThat(bulletSpan1Margin).isEqualTo(expectedMargin)
+    assertThat(bulletSpan1Margin).isEqualTo(66)
   }
 
   @Test
@@ -331,7 +314,7 @@ class ListItemLeadingMarginSpanTest {
 
     val bulletSpan0 = bulletSpans[0] as ListItemLeadingMarginSpan.OlSpan
     val leadingText = "1."
-    val expectedMargin = 2 * leadingText.length + spacingBeforeNumberedText
+    val expectedMargin = 2 * leadingText.length + spacingBeforeText
 
     val bulletSpan0Margin = bulletSpan0.getLeadingMargin(true)
     assertThat(bulletSpan0Margin).isEqualTo(expectedMargin)
@@ -372,7 +355,7 @@ class ListItemLeadingMarginSpanTest {
     assertThat(bulletSpans.size.toLong()).isEqualTo(2)
     val bulletSpan0 = bulletSpans[0] as ListItemLeadingMarginSpan.OlSpan
     val leadingText = "1."
-    val expectedMargin = 2 * leadingText.length + spacingBeforeNumberedText
+    val expectedMargin = 2 * leadingText.length + spacingBeforeText
 
     val bulletSpan0Margin = bulletSpan0.getLeadingMargin(true)
     assertThat(bulletSpan0Margin).isEqualTo(expectedMargin)
@@ -467,18 +450,16 @@ class ListItemLeadingMarginSpanTest {
     )
 
     val shadowCanvas = shadowOf(canvas)
-    // The below assertion verifies the 1st item of inner level list
-    assertThat(shadowCanvas.getDrawnCircle(0).centerX).isWithin(1e-5f).of(72.0f)
+    assertThat(shadowCanvas.getDrawnCircle(0).centerX).isWithin(1e-5f).of(33.0f)
     assertThat(shadowCanvas.getDrawnCircle(0).centerY).isWithin(1e-5f).of(48.0f)
-    // The below assertion verifies the 2nd item of inner level list
-    assertThat(shadowCanvas.getDrawnCircle(1).centerX).isWithin(1e-5f).of(72.0f)
+
+    assertThat(shadowCanvas.getDrawnCircle(1).centerX).isWithin(1e-5f).of(99.0f)
     assertThat(shadowCanvas.getDrawnCircle(1).centerY).isWithin(1e-5f).of(139.0f)
 
-    // The below assertion verifies the 1st item of outer level list
-    assertThat(shadowCanvas.getDrawnCircle(2).centerX).isWithin(1e-5f).of(24.0f)
+    assertThat(shadowCanvas.getDrawnCircle(2).centerX).isWithin(1e-5f).of(99.0f)
     assertThat(shadowCanvas.getDrawnCircle(2).centerY).isWithin(1e-5f).of(225.0f)
-    // The below assertion verifies the 2nd item of outer level list
-    assertThat(shadowCanvas.getDrawnCircle(3).centerX).isWithin(1e-5f).of(24.0f)
+
+    assertThat(shadowCanvas.getDrawnCircle(3).centerX).isWithin(1e-5f).of(33.0f)
     assertThat(shadowCanvas.getDrawnCircle(3).centerY).isWithin(1e-5f).of(397.0f)
   }
 
@@ -581,18 +562,16 @@ class ListItemLeadingMarginSpanTest {
       textView.layout
     )
 
-    // The below assertion verifies the 1st item of inner level list
-    assertThat(shadowCanvas.getDrawnCircle(0).centerX).isWithin(1e-5f).of(887.0f)
+    assertThat(shadowCanvas.getDrawnCircle(0).centerX).isWithin(1e-5f).of(944.0f)
     assertThat(shadowCanvas.getDrawnCircle(0).centerY).isWithin(1e-5f).of(48.0f)
-    // The below assertion verifies the 2nd item of inner level list
-    assertThat(shadowCanvas.getDrawnCircle(1).centerX).isWithin(1e-5f).of(887.0f)
+
+    assertThat(shadowCanvas.getDrawnCircle(1).centerX).isWithin(1e-5f).of(878.0f)
     assertThat(shadowCanvas.getDrawnCircle(1).centerY).isWithin(1e-5f).of(139.0f)
 
-    // The below assertion verifies the 1st item of outer level list
-    assertThat(shadowCanvas.getDrawnCircle(2).centerX).isWithin(1e-5f).of(935.0f)
+    assertThat(shadowCanvas.getDrawnCircle(2).centerX).isWithin(1e-5f).of(878.0f)
     assertThat(shadowCanvas.getDrawnCircle(2).centerY).isWithin(1e-5f).of(225.0f)
-    // The below assertion verifies the 2nd item of outer level list
-    assertThat(shadowCanvas.getDrawnCircle(3).centerX).isWithin(1e-5f).of(935.0f)
+
+    assertThat(shadowCanvas.getDrawnCircle(3).centerX).isWithin(1e-5f).of(944.0f)
     assertThat(shadowCanvas.getDrawnCircle(3).centerY).isWithin(1e-5f).of(397.0f)
   }
 
@@ -694,18 +673,16 @@ class ListItemLeadingMarginSpanTest {
       textView.layout
     )
 
-    // The below assertion verifies the 1st item of inner level list
-    assertThat(shadowCanvas.getDrawnCircle(0).centerX).isWithin(1e-5f).of(72.0f)
+    assertThat(shadowCanvas.getDrawnCircle(0).centerX).isWithin(1e-5f).of(33.0f)
     assertThat(shadowCanvas.getDrawnCircle(0).centerY).isWithin(1e-5f).of(48.0f)
-    // The below assertion verifies the 2nd item of inner level list
-    assertThat(shadowCanvas.getDrawnCircle(1).centerX).isWithin(1e-5f).of(72.0f)
+
+    assertThat(shadowCanvas.getDrawnCircle(1).centerX).isWithin(1e-5f).of(99.0f)
     assertThat(shadowCanvas.getDrawnCircle(1).centerY).isWithin(1e-5f).of(139.0f)
 
-    // The below assertion verifies the 1st item of outer level list
-    assertThat(shadowCanvas.getDrawnCircle(2).centerX).isWithin(1e-5f).of(24.0f)
+    assertThat(shadowCanvas.getDrawnCircle(2).centerX).isWithin(1e-5f).of(99.0f)
     assertThat(shadowCanvas.getDrawnCircle(2).centerY).isWithin(1e-5f).of(225.0f)
-    // The below assertion verifies the 2nd item of outer level list
-    assertThat(shadowCanvas.getDrawnCircle(3).centerX).isWithin(1e-5f).of(24.0f)
+
+    assertThat(shadowCanvas.getDrawnCircle(3).centerX).isWithin(1e-5f).of(33.0f)
     assertThat(shadowCanvas.getDrawnCircle(3).centerY).isWithin(1e-5f).of(397.0f)
   }
 
@@ -810,23 +787,19 @@ class ListItemLeadingMarginSpanTest {
     )
 
     assertThat(shadowCanvas.textHistoryCount).isEqualTo(4)
-    // The below assertion verifies the 1st item of inner level list
-    assertThat(shadowCanvas.getDrawnTextEvent(0).x).isWithin(1e-5f).of(864.0f)
+    assertThat(shadowCanvas.getDrawnTextEvent(0).x).isWithin(1e-5f).of(935.0f)
     assertThat(shadowCanvas.getDrawnTextEvent(0).y).isWithin(1e-5f).of(78.0f)
     assertThat(shadowCanvas.getDrawnTextEvent(0).text).isEqualTo("١.")
 
-    // The below assertion verifies the 2nd item of inner level list
-    assertThat(shadowCanvas.getDrawnTextEvent(1).x).isWithin(1e-5f).of(864.0f)
+    assertThat(shadowCanvas.getDrawnTextEvent(1).x).isWithin(1e-5f).of(887.0f)
     assertThat(shadowCanvas.getDrawnTextEvent(1).y).isWithin(1e-5f).of(164.0f)
-    assertThat(shadowCanvas.getDrawnTextEvent(1).text).isEqualTo("٢.")
+    assertThat(shadowCanvas.getDrawnTextEvent(1).text).isEqualTo("١.")
 
-    // The below assertion verifies the 1st item of outer level list
-    assertThat(shadowCanvas.getDrawnTextEvent(2).x).isWithin(1e-5f).of(912.0f)
+    assertThat(shadowCanvas.getDrawnTextEvent(2).x).isWithin(1e-5f).of(887.0f)
     assertThat(shadowCanvas.getDrawnTextEvent(2).y).isWithin(1e-5f).of(250.0f)
-    assertThat(shadowCanvas.getDrawnTextEvent(2).text).isEqualTo("١.")
+    assertThat(shadowCanvas.getDrawnTextEvent(2).text).isEqualTo("٢.")
 
-    // The below assertion verifies the 2nd item of outer level list
-    assertThat(shadowCanvas.getDrawnTextEvent(3).x).isWithin(1e-5f).of(912.0f)
+    assertThat(shadowCanvas.getDrawnTextEvent(3).x).isWithin(1e-5f).of(935.0f)
     assertThat(shadowCanvas.getDrawnTextEvent(3).y).isWithin(1e-5f).of(422.0f)
     assertThat(shadowCanvas.getDrawnTextEvent(3).text).isEqualTo("٢.")
   }
@@ -932,22 +905,18 @@ class ListItemLeadingMarginSpanTest {
     )
 
     assertThat(shadowCanvas.textHistoryCount).isEqualTo(4)
-    // The below assertion verifies the 1st item of inner level list
-    assertThat(shadowCanvas.getDrawnTextEvent(0).x).isWithin(1e-5f).of(72.0f)
+    assertThat(shadowCanvas.getDrawnTextEvent(0).x).isWithin(1e-5f).of(24.0f)
     assertThat(shadowCanvas.getDrawnTextEvent(0).y).isWithin(1e-5f).of(78.0f)
     assertThat(shadowCanvas.getDrawnTextEvent(0).text).isEqualTo("1.")
 
-    // The below assertion verifies the 2nd item of inner level list
     assertThat(shadowCanvas.getDrawnTextEvent(1).x).isWithin(1e-5f).of(72.0f)
     assertThat(shadowCanvas.getDrawnTextEvent(1).y).isWithin(1e-5f).of(164.0f)
-    assertThat(shadowCanvas.getDrawnTextEvent(1).text).isEqualTo("2.")
+    assertThat(shadowCanvas.getDrawnTextEvent(1).text).isEqualTo("1.")
 
-    // The below assertion verifies the 1st item of outer level list
-    assertThat(shadowCanvas.getDrawnTextEvent(2).x).isWithin(1e-5f).of(24.0f)
+    assertThat(shadowCanvas.getDrawnTextEvent(2).x).isWithin(1e-5f).of(72.0f)
     assertThat(shadowCanvas.getDrawnTextEvent(2).y).isWithin(1e-5f).of(250.0f)
-    assertThat(shadowCanvas.getDrawnTextEvent(2).text).isEqualTo("1.")
+    assertThat(shadowCanvas.getDrawnTextEvent(2).text).isEqualTo("2.")
 
-    // The below assertion verifies the 2nd item of outer level list
     assertThat(shadowCanvas.getDrawnTextEvent(3).x).isWithin(1e-5f).of(24.0f)
     assertThat(shadowCanvas.getDrawnTextEvent(3).y).isWithin(1e-5f).of(422.0f)
     assertThat(shadowCanvas.getDrawnTextEvent(3).text).isEqualTo("2.")
@@ -1044,22 +1013,18 @@ class ListItemLeadingMarginSpanTest {
     val shadowCanvas = shadowOf(canvas)
 
     assertThat(shadowCanvas.textHistoryCount).isEqualTo(4)
-    // The below assertion verifies the 1st item of inner level list
-    assertThat(shadowCanvas.getDrawnTextEvent(0).x).isWithin(1e-5f).of(72.0f)
+    assertThat(shadowCanvas.getDrawnTextEvent(0).x).isWithin(1e-5f).of(24.0f)
     assertThat(shadowCanvas.getDrawnTextEvent(0).y).isWithin(1e-5f).of(78.0f)
     assertThat(shadowCanvas.getDrawnTextEvent(0).text).isEqualTo("1.")
 
-    // The below assertion verifies the 2nd item of inner level list
     assertThat(shadowCanvas.getDrawnTextEvent(1).x).isWithin(1e-5f).of(72.0f)
     assertThat(shadowCanvas.getDrawnTextEvent(1).y).isWithin(1e-5f).of(164.0f)
-    assertThat(shadowCanvas.getDrawnTextEvent(1).text).isEqualTo("2.")
+    assertThat(shadowCanvas.getDrawnTextEvent(1).text).isEqualTo("1.")
 
-    // The below assertion verifies the 1st item of outer level list
-    assertThat(shadowCanvas.getDrawnTextEvent(2).x).isWithin(1e-5f).of(24.0f)
+    assertThat(shadowCanvas.getDrawnTextEvent(2).x).isWithin(1e-5f).of(72.0f)
     assertThat(shadowCanvas.getDrawnTextEvent(2).y).isWithin(1e-5f).of(250.0f)
-    assertThat(shadowCanvas.getDrawnTextEvent(2).text).isEqualTo("1.")
+    assertThat(shadowCanvas.getDrawnTextEvent(2).text).isEqualTo("2.")
 
-    // The below assertion verifies the 2nd item of outer level list
     assertThat(shadowCanvas.getDrawnTextEvent(3).x).isWithin(1e-5f).of(24.0f)
     assertThat(shadowCanvas.getDrawnTextEvent(3).y).isWithin(1e-5f).of(422.0f)
     assertThat(shadowCanvas.getDrawnTextEvent(3).text).isEqualTo("2.")
diff --git a/app/src/test/java/org/oppia/android/app/profile/ProfileChooserFragmentLocalTest.kt b/app/src/test/java/org/oppia/android/app/profile/ProfileChooserFragmentLocalTest.kt
index 3a3ec320eff..7471a805c0f 100644
--- a/app/src/test/java/org/oppia/android/app/profile/ProfileChooserFragmentLocalTest.kt
+++ b/app/src/test/java/org/oppia/android/app/profile/ProfileChooserFragmentLocalTest.kt
@@ -63,6 +63,7 @@ import org.oppia.android.testing.FakeAnalyticsEventLogger
 import org.oppia.android.testing.TestLogReportingModule
 import org.oppia.android.testing.junit.InitializeDefaultLocaleRule
 import org.oppia.android.testing.robolectric.RobolectricModule
+import org.oppia.android.testing.threading.TestCoroutineDispatchers
 import org.oppia.android.testing.threading.TestDispatcherModule
 import org.oppia.android.testing.time.FakeOppiaClockModule
 import org.oppia.android.util.accessibility.AccessibilityTestModule
@@ -91,11 +92,10 @@ import javax.inject.Singleton
   qualifiers = "port-xxhdpi"
 )
 class ProfileChooserFragmentLocalTest {
-  @get:Rule
-  val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
+  @get:Rule val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
 
-  @Inject
-  lateinit var fakeAnalyticsEventLogger: FakeAnalyticsEventLogger
+  @Inject lateinit var fakeAnalyticsEventLogger: FakeAnalyticsEventLogger
+  @Inject lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
 
   @Before
   fun setUp() {
@@ -105,6 +105,7 @@ class ProfileChooserFragmentLocalTest {
   @Test
   fun testProfileChooser_onLaunch_logsEvent() {
     launch<ProfileChooserActivity>(createProfileChooserActivityIntent()).use {
+      testCoroutineDispatchers.runCurrent()
       val event = fakeAnalyticsEventLogger.getMostRecentEvent()
 
       assertThat(event.priority).isEqualTo(Priority.ESSENTIAL)
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 fd81063670b..d8522e494c9 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
@@ -65,6 +65,7 @@ import org.oppia.android.testing.FakeAnalyticsEventLogger
 import org.oppia.android.testing.TestLogReportingModule
 import org.oppia.android.testing.junit.InitializeDefaultLocaleRule
 import org.oppia.android.testing.robolectric.RobolectricModule
+import org.oppia.android.testing.threading.TestCoroutineDispatchers
 import org.oppia.android.testing.threading.TestDispatcherModule
 import org.oppia.android.testing.time.FakeOppiaClockModule
 import org.oppia.android.util.accessibility.AccessibilityTestModule
@@ -96,11 +97,10 @@ private const val TEST_STORY_ID = "GJ2rLXRKD5hw"
   qualifiers = "port-xxhdpi"
 )
 class StoryActivityLocalTest {
-  @get:Rule
-  val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
+  @get:Rule val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
 
-  @Inject
-  lateinit var fakeAnalyticsEventLogger: FakeAnalyticsEventLogger
+  @Inject lateinit var fakeAnalyticsEventLogger: FakeAnalyticsEventLogger
+  @Inject lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
 
   private val internalProfileId = 0
 
@@ -120,6 +120,7 @@ class StoryActivityLocalTest {
     ActivityScenario.launch<StoryActivity>(
       createStoryActivityIntent(internalProfileId, TEST_TOPIC_ID, TEST_STORY_ID)
     ).use {
+      testCoroutineDispatchers.runCurrent()
       val event = fakeAnalyticsEventLogger.getMostRecentEvent()
 
       assertThat(event.priority).isEqualTo(EventLog.Priority.ESSENTIAL)
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 c3df6eac9e8..51c8a02f2c0 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
@@ -63,6 +63,7 @@ import org.oppia.android.testing.TestLogReportingModule
 import org.oppia.android.testing.junit.InitializeDefaultLocaleRule
 import org.oppia.android.testing.platformparameter.TestPlatformParameterModule
 import org.oppia.android.testing.robolectric.RobolectricModule
+import org.oppia.android.testing.threading.TestCoroutineDispatchers
 import org.oppia.android.testing.threading.TestDispatcherModule
 import org.oppia.android.testing.time.FakeOppiaClockModule
 import org.oppia.android.util.accessibility.AccessibilityTestModule
@@ -93,11 +94,10 @@ private const val TEST_TOPIC_ID = "GJ2rLXRKD5hw"
   qualifiers = "port-xxhdpi"
 )
 class TopicInfoFragmentLocalTest {
-  @get:Rule
-  val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
+  @get:Rule val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
 
-  @Inject
-  lateinit var fakeAnalyticsEventLogger: FakeAnalyticsEventLogger
+  @Inject lateinit var fakeAnalyticsEventLogger: FakeAnalyticsEventLogger
+  @Inject lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
 
   private val internalProfileId = 0
 
@@ -110,6 +110,7 @@ class TopicInfoFragmentLocalTest {
   fun testTopicInfoFragment_onLaunch_logsEvent() {
     TestPlatformParameterModule.forceEnableExtraTopicTabsUi(true)
     launchTopicActivityIntent(internalProfileId, TEST_TOPIC_ID).use {
+      testCoroutineDispatchers.runCurrent()
       val event = fakeAnalyticsEventLogger.getMostRecentEvent()
 
       assertThat(event.context.activityContextCase).isEqualTo(OPEN_INFO_TAB)
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 bb3c4ab52d7..909a8d12d35 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
@@ -62,6 +62,7 @@ import org.oppia.android.testing.FakeAnalyticsEventLogger
 import org.oppia.android.testing.TestLogReportingModule
 import org.oppia.android.testing.junit.InitializeDefaultLocaleRule
 import org.oppia.android.testing.robolectric.RobolectricModule
+import org.oppia.android.testing.threading.TestCoroutineDispatchers
 import org.oppia.android.testing.threading.TestDispatcherModule
 import org.oppia.android.testing.time.FakeOppiaClockModule
 import org.oppia.android.util.accessibility.AccessibilityTestModule
@@ -93,11 +94,10 @@ private const val TEST_STORY_ID = "GJ2rLXRKD5hw"
   qualifiers = "port-xxhdpi"
 )
 class TopicLessonsFragmentLocalTest {
-  @get:Rule
-  val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
+  @get:Rule val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
 
-  @Inject
-  lateinit var fakeAnalyticsEventLogger: FakeAnalyticsEventLogger
+  @Inject lateinit var fakeAnalyticsEventLogger: FakeAnalyticsEventLogger
+  @Inject lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
 
   private val internalProfileId = 0
 
@@ -109,6 +109,7 @@ class TopicLessonsFragmentLocalTest {
   @Test
   fun testTopicLessonsFragment_onLaunch_logsEvent() {
     launchTopicActivityIntent(internalProfileId, TEST_TOPIC_ID, TEST_STORY_ID).use {
+      testCoroutineDispatchers.runCurrent()
       val event = fakeAnalyticsEventLogger.getMostRecentEvent()
 
       assertThat(event.context.activityContextCase)
diff --git a/app/src/test/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityLocalTest.kt b/app/src/test/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityLocalTest.kt
index 1af9dee8a20..ce3d2d4d06f 100644
--- a/app/src/test/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityLocalTest.kt
+++ b/app/src/test/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityLocalTest.kt
@@ -64,6 +64,7 @@ import org.oppia.android.testing.FakeAnalyticsEventLogger
 import org.oppia.android.testing.TestLogReportingModule
 import org.oppia.android.testing.junit.InitializeDefaultLocaleRule
 import org.oppia.android.testing.robolectric.RobolectricModule
+import org.oppia.android.testing.threading.TestCoroutineDispatchers
 import org.oppia.android.testing.threading.TestDispatcherModule
 import org.oppia.android.testing.time.FakeOppiaClockModule
 import org.oppia.android.util.accessibility.AccessibilityTestModule
@@ -92,15 +93,14 @@ import javax.inject.Singleton
   qualifiers = "port-xxhdpi"
 )
 class RevisionCardActivityLocalTest {
-  @get:Rule
-  val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
+  @get:Rule val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
+
+  @Inject lateinit var fakeAnalyticsEventLogger: FakeAnalyticsEventLogger
+  @Inject lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
 
   private val internalProfileId = 1
   private val fractionsSubtopicListSize: Int = 4
 
-  @Inject
-  lateinit var fakeAnalyticsEventLogger: FakeAnalyticsEventLogger
-
   @Before
   fun setUp() {
     setUpTestApplicationComponent()
@@ -117,6 +117,7 @@ class RevisionCardActivityLocalTest {
         fractionsSubtopicListSize
       )
     ).use {
+      testCoroutineDispatchers.runCurrent()
       val event = fakeAnalyticsEventLogger.getMostRecentEvent()
 
       assertThat(event.context.activityContextCase).isEqualTo(OPEN_REVISION_CARD)
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 a3a35e10c42..077ac2cc14c 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
@@ -99,12 +99,9 @@ class OppiaLoggerTest {
     private val TEST_ERROR_EXCEPTION = Throwable(TEST_ERROR_LOG_EXCEPTION)
   }
 
-  @Inject
-  lateinit var oppiaLogger: OppiaLogger
-  @Inject
-  lateinit var fakeAnalyticsEventLogger: FakeAnalyticsEventLogger
-  @Inject
-  lateinit var fakeOppiaClock: FakeOppiaClock
+  @Inject lateinit var oppiaLogger: OppiaLogger
+  @Inject lateinit var fakeAnalyticsEventLogger: FakeAnalyticsEventLogger
+  @Inject lateinit var fakeOppiaClock: FakeOppiaClock
 
   @Before
   fun setUp() {
diff --git a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/ApplicationLifecycleModuleTest.kt b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/ApplicationLifecycleModuleTest.kt
index ebe4684dbee..c99666410c1 100644
--- a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/ApplicationLifecycleModuleTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/ApplicationLifecycleModuleTest.kt
@@ -23,6 +23,7 @@ import org.oppia.android.testing.platformparameter.TestPlatformParameterModule
 import org.oppia.android.testing.robolectric.RobolectricModule
 import org.oppia.android.testing.threading.TestDispatcherModule
 import org.oppia.android.testing.time.FakeOppiaClockModule
+import org.oppia.android.util.caching.AssetModule
 import org.oppia.android.util.data.DataProvidersInjector
 import org.oppia.android.util.data.DataProvidersInjectorProvider
 import org.oppia.android.util.locale.LocaleProdModule
@@ -100,7 +101,8 @@ class ApplicationLifecycleModuleTest {
       NetworkConnectionUtilDebugModule::class, LocaleProdModule::class,
       TestPlatformParameterModule::class, PlatformParameterSingletonModule::class,
       TestLoggingIdentifierModule::class, ApplicationLifecycleModule::class,
-      LoggerModule::class, SyncStatusModule::class, CpuPerformanceSnapshotterModule::class
+      LoggerModule::class, SyncStatusModule::class, CpuPerformanceSnapshotterModule::class,
+      AssetModule::class
     ]
   )
   interface TestApplicationComponent : DataProvidersInjector {
diff --git a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/ApplicationLifecycleObserverTest.kt b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/ApplicationLifecycleObserverTest.kt
index e1d0a1c1aa1..0d5d660b15e 100644
--- a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/ApplicationLifecycleObserverTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/ApplicationLifecycleObserverTest.kt
@@ -34,6 +34,7 @@ import org.oppia.android.testing.threading.TestCoroutineDispatchers
 import org.oppia.android.testing.threading.TestDispatcherModule
 import org.oppia.android.testing.time.FakeOppiaClock
 import org.oppia.android.testing.time.FakeOppiaClockModule
+import org.oppia.android.util.caching.AssetModule
 import org.oppia.android.util.data.DataProvidersInjector
 import org.oppia.android.util.data.DataProvidersInjectorProvider
 import org.oppia.android.util.locale.LocaleProdModule
@@ -454,7 +455,7 @@ class ApplicationLifecycleObserverTest {
       NetworkConnectionUtilDebugModule::class, LocaleProdModule::class,
       TestPlatformParameterModule::class, PlatformParameterSingletonModule::class,
       TestLoggingIdentifierModule::class, ApplicationLifecycleModule::class,
-      SyncStatusModule::class, CpuPerformanceSnapshotterModule::class
+      SyncStatusModule::class, CpuPerformanceSnapshotterModule::class, AssetModule::class
     ]
   )
   interface TestApplicationComponent : DataProvidersInjector {
diff --git a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel
index 4edf8ffe1ce..e32c9758b31 100644
--- a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel
+++ b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel
@@ -59,6 +59,7 @@ oppia_android_test(
         "//third_party:org_mockito_mockito-core",
         "//third_party:org_robolectric_robolectric",
         "//third_party:robolectric_android-all",
+        "//utility/src/main/java/org/oppia/android/util/caching:asset_prod_module",
         "//utility/src/main/java/org/oppia/android/util/locale:prod_module",
         "//utility/src/main/java/org/oppia/android/util/networking:debug_module",
     ],
@@ -87,6 +88,7 @@ oppia_android_test(
         "//third_party:junit_junit",
         "//third_party:org_robolectric_robolectric",
         "//third_party:robolectric_android-all",
+        "//utility/src/main/java/org/oppia/android/util/caching:asset_prod_module",
         "//utility/src/main/java/org/oppia/android/util/locale:prod_module",
         "//utility/src/main/java/org/oppia/android/util/networking:debug_module",
     ],
diff --git a/domain/src/test/java/org/oppia/android/domain/topic/StoryProgressControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/topic/StoryProgressControllerTest.kt
index 19d389bc185..41ce616f733 100644
--- a/domain/src/test/java/org/oppia/android/domain/topic/StoryProgressControllerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/topic/StoryProgressControllerTest.kt
@@ -26,6 +26,7 @@ import org.oppia.android.testing.robolectric.RobolectricModule
 import org.oppia.android.testing.threading.TestDispatcherModule
 import org.oppia.android.testing.time.FakeOppiaClock
 import org.oppia.android.testing.time.FakeOppiaClockModule
+import org.oppia.android.util.caching.AssetModule
 import org.oppia.android.util.caching.CacheAssetsLocally
 import org.oppia.android.util.data.DataProvidersInjector
 import org.oppia.android.util.data.DataProvidersInjectorProvider
@@ -330,7 +331,7 @@ class StoryProgressControllerTest {
       NetworkConnectionUtilDebugModule::class, LocaleProdModule::class,
       LoggingIdentifierModule::class, ApplicationLifecycleModule::class,
       SyncStatusModule::class, PlatformParameterModule::class,
-      PlatformParameterSingletonModule::class
+      PlatformParameterSingletonModule::class, AssetModule::class
     ]
   )
   interface TestApplicationComponent : DataProvidersInjector {
diff --git a/testing/src/test/java/org/oppia/android/testing/profile/ProfileTestHelperTest.kt b/testing/src/test/java/org/oppia/android/testing/profile/ProfileTestHelperTest.kt
index 24cd6ba31c1..016e3361a70 100644
--- a/testing/src/test/java/org/oppia/android/testing/profile/ProfileTestHelperTest.kt
+++ b/testing/src/test/java/org/oppia/android/testing/profile/ProfileTestHelperTest.kt
@@ -34,6 +34,7 @@ import org.oppia.android.testing.robolectric.RobolectricModule
 import org.oppia.android.testing.threading.TestCoroutineDispatchers
 import org.oppia.android.testing.threading.TestDispatcherModule
 import org.oppia.android.testing.time.FakeOppiaClockModule
+import org.oppia.android.util.caching.AssetModule
 import org.oppia.android.util.data.AsyncResult
 import org.oppia.android.util.data.DataProvidersInjector
 import org.oppia.android.util.data.DataProvidersInjectorProvider
@@ -90,7 +91,7 @@ class ProfileTestHelperTest {
     assertThat(profiles[0].isAdmin).isTrue()
     assertThat(profiles[1].name).isEqualTo("Ben")
     assertThat(profiles[1].isAdmin).isFalse()
-    assertThat(profileManagementController.getCurrentProfileId().internalId).isEqualTo(0)
+    assertThat(profileManagementController.getCurrentProfileId()?.internalId).isEqualTo(0)
   }
 
   @Test
@@ -105,7 +106,7 @@ class ProfileTestHelperTest {
     assertThat(profiles.size).isEqualTo(1)
     assertThat(profiles[0].name).isEqualTo("Admin")
     assertThat(profiles[0].isAdmin).isTrue()
-    assertThat(profileManagementController.getCurrentProfileId().internalId).isEqualTo(0)
+    assertThat(profileManagementController.getCurrentProfileId()?.internalId).isEqualTo(0)
   }
 
   @Test
@@ -124,7 +125,7 @@ class ProfileTestHelperTest {
     profileTestHelper.initializeProfiles()
     val loginProvider = profileTestHelper.logIntoAdmin()
     monitorFactory.waitForNextSuccessfulResult(loginProvider)
-    assertThat(profileManagementController.getCurrentProfileId().internalId).isEqualTo(0)
+    assertThat(profileManagementController.getCurrentProfileId()?.internalId).isEqualTo(0)
   }
 
   @Test
@@ -132,7 +133,7 @@ class ProfileTestHelperTest {
     profileTestHelper.initializeProfiles()
     val loginProvider = profileTestHelper.logIntoUser()
     monitorFactory.waitForNextSuccessfulResult(loginProvider)
-    assertThat(profileManagementController.getCurrentProfileId().internalId).isEqualTo(1)
+    assertThat(profileManagementController.getCurrentProfileId()?.internalId).isEqualTo(1)
   }
 
   @Test
@@ -140,7 +141,7 @@ class ProfileTestHelperTest {
     profileTestHelper.initializeProfiles()
     val loginProvider = profileTestHelper.logIntoNewUser()
     monitorFactory.waitForNextSuccessfulResult(loginProvider)
-    assertThat(profileManagementController.getCurrentProfileId().internalId).isEqualTo(2)
+    assertThat(profileManagementController.getCurrentProfileId()?.internalId).isEqualTo(2)
   }
 
   // TODO(#89): Move this to a common test application component.
@@ -175,7 +176,7 @@ class ProfileTestHelperTest {
       TestDispatcherModule::class, RobolectricModule::class, FakeOppiaClockModule::class,
       NetworkConnectionUtilDebugModule::class, LocaleProdModule::class,
       LoggingIdentifierModule::class, ApplicationLifecycleModule::class, SyncStatusModule::class,
-      PlatformParameterModule::class, PlatformParameterSingletonModule::class
+      PlatformParameterModule::class, PlatformParameterSingletonModule::class, AssetModule::class
     ]
   )
   interface TestApplicationComponent : DataProvidersInjector {

From c0210177ada075da89b4b91b8428cf21b41405bf Mon Sep 17 00:00:00 2001
From: Ben Henning <ben@oppia.org>
Date: Mon, 30 Jan 2023 07:32:37 -0800
Subject: [PATCH 25/38] Fix more broken tests.

These were missed in Bazel since test targets were never originally
added for them.
---
 .../domain/oppialogger/analytics/BUILD.bazel  | 120 ++++++++++++++++++
 .../CpuPerformanceSnapshotterTest.kt          |   3 +-
 .../oppialogger/analytics/testing/BUILD.bazel |  41 ++++++
 .../analytics/testing/FakeLogSchedulerTest.kt |   3 +-
 4 files changed, 165 insertions(+), 2 deletions(-)
 create mode 100644 domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/testing/BUILD.bazel

diff --git a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel
index e32c9758b31..07798e4ca64 100644
--- a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel
+++ b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel
@@ -94,6 +94,65 @@ oppia_android_test(
     ],
 )
 
+oppia_android_test(
+    name = "CpuPerformanceSnapshotterModuleTest",
+    srcs = ["CpuPerformanceSnapshotterModuleTest.kt"],
+    custom_package = "org.oppia.android.domain.oppialogger.analytics",
+    test_class = "org.oppia.android.domain.oppialogger.analytics.CpuPerformanceSnapshotterModuleTest",
+    test_manifest = "//domain:test_manifest",
+    deps = [
+        ":dagger",
+        "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:cpu_module",
+        "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:prod_module",
+        "//testing",
+        "//testing/src/main/java/org/oppia/android/testing/data:data_provider_test_monitor",
+        "//testing/src/main/java/org/oppia/android/testing/platformparameter:test_module",
+        "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module",
+        "//testing/src/main/java/org/oppia/android/testing/threading:test_coroutine_dispatchers",
+        "//testing/src/main/java/org/oppia/android/testing/threading:test_module",
+        "//testing/src/main/java/org/oppia/android/testing/time:test_module",
+        "//third_party:androidx_test_ext_junit",
+        "//third_party:com_google_truth_truth",
+        "//third_party:junit_junit",
+        "//third_party:org_mockito_mockito-core",
+        "//third_party:org_robolectric_robolectric",
+        "//third_party:robolectric_android-all",
+        "//utility/src/main/java/org/oppia/android/util/caching:asset_prod_module",
+        "//utility/src/main/java/org/oppia/android/util/locale:prod_module",
+        "//utility/src/main/java/org/oppia/android/util/networking:debug_module",
+    ],
+)
+
+oppia_android_test(
+    name = "CpuPerformanceSnapshotterTest",
+    srcs = ["CpuPerformanceSnapshotterTest.kt"],
+    custom_package = "org.oppia.android.domain.oppialogger.analytics",
+    test_class = "org.oppia.android.domain.oppialogger.analytics.CpuPerformanceSnapshotterTest",
+    test_manifest = "//domain:test_manifest",
+    deps = [
+        ":dagger",
+        "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:cpu_module",
+        "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:prod_module",
+        "//testing",
+        "//testing/src/main/java/org/oppia/android/testing/data:data_provider_test_monitor",
+        "//testing/src/main/java/org/oppia/android/testing/logging:sync_status_test_module",
+        "//testing/src/main/java/org/oppia/android/testing/platformparameter:test_module",
+        "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module",
+        "//testing/src/main/java/org/oppia/android/testing/threading:test_coroutine_dispatchers",
+        "//testing/src/main/java/org/oppia/android/testing/threading:test_module",
+        "//testing/src/main/java/org/oppia/android/testing/time:test_module",
+        "//third_party:androidx_test_ext_junit",
+        "//third_party:com_google_truth_truth",
+        "//third_party:junit_junit",
+        "//third_party:org_mockito_mockito-core",
+        "//third_party:org_robolectric_robolectric",
+        "//third_party:robolectric_android-all",
+        "//utility/src/main/java/org/oppia/android/util/caching:asset_prod_module",
+        "//utility/src/main/java/org/oppia/android/util/locale:prod_module",
+        "//utility/src/main/java/org/oppia/android/util/networking:debug_module",
+    ],
+)
+
 oppia_android_test(
     name = "LearnerAnalyticsLoggerTest",
     srcs = ["LearnerAnalyticsLoggerTest.kt"],
@@ -138,4 +197,65 @@ oppia_android_test(
     ],
 )
 
+oppia_android_test(
+    name = "PerformanceMetricsControllerTest",
+    srcs = ["PerformanceMetricsControllerTest.kt"],
+    custom_package = "org.oppia.android.domain.oppialogger.analytics",
+    test_class = "org.oppia.android.domain.oppialogger.analytics.PerformanceMetricsControllerTest",
+    test_manifest = "//domain:test_manifest",
+    deps = [
+        ":dagger",
+        "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:cpu_module",
+        "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:prod_module",
+        "//domain/src/main/java/org/oppia/android/domain/oppialogger/logscheduler:metric_log_scheduler_module",
+        "//testing",
+        "//testing/src/main/java/org/oppia/android/testing/data:data_provider_test_monitor",
+        "//testing/src/main/java/org/oppia/android/testing/logging:sync_status_test_module",
+        "//testing/src/main/java/org/oppia/android/testing/platformparameter:test_module",
+        "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module",
+        "//testing/src/main/java/org/oppia/android/testing/threading:test_coroutine_dispatchers",
+        "//testing/src/main/java/org/oppia/android/testing/threading:test_module",
+        "//testing/src/main/java/org/oppia/android/testing/time:test_module",
+        "//third_party:androidx_test_ext_junit",
+        "//third_party:com_google_truth_truth",
+        "//third_party:junit_junit",
+        "//third_party:org_mockito_mockito-core",
+        "//third_party:org_robolectric_robolectric",
+        "//third_party:robolectric_android-all",
+        "//utility/src/main/java/org/oppia/android/util/caching:asset_prod_module",
+        "//utility/src/main/java/org/oppia/android/util/locale:prod_module",
+        "//utility/src/main/java/org/oppia/android/util/networking:debug_module",
+    ],
+)
+
+oppia_android_test(
+    name = "PerformanceMetricsLoggerTest",
+    srcs = ["PerformanceMetricsLoggerTest.kt"],
+    custom_package = "org.oppia.android.domain.oppialogger.analytics",
+    test_class = "org.oppia.android.domain.oppialogger.analytics.PerformanceMetricsLoggerTest",
+    test_manifest = "//domain:test_manifest",
+    deps = [
+        ":dagger",
+        "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:cpu_module",
+        "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:prod_module",
+        "//testing",
+        "//testing/src/main/java/org/oppia/android/testing/data:data_provider_test_monitor",
+        "//testing/src/main/java/org/oppia/android/testing/logging:sync_status_test_module",
+        "//testing/src/main/java/org/oppia/android/testing/platformparameter:test_module",
+        "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module",
+        "//testing/src/main/java/org/oppia/android/testing/threading:test_coroutine_dispatchers",
+        "//testing/src/main/java/org/oppia/android/testing/threading:test_module",
+        "//testing/src/main/java/org/oppia/android/testing/time:test_module",
+        "//third_party:androidx_test_ext_junit",
+        "//third_party:com_google_truth_truth",
+        "//third_party:junit_junit",
+        "//third_party:org_mockito_mockito-core",
+        "//third_party:org_robolectric_robolectric",
+        "//third_party:robolectric_android-all",
+        "//utility/src/main/java/org/oppia/android/util/caching:asset_prod_module",
+        "//utility/src/main/java/org/oppia/android/util/locale:prod_module",
+        "//utility/src/main/java/org/oppia/android/util/networking:debug_module",
+    ],
+)
+
 dagger_rules()
diff --git a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/CpuPerformanceSnapshotterTest.kt b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/CpuPerformanceSnapshotterTest.kt
index 09c11bc62b6..1641eb00223 100644
--- a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/CpuPerformanceSnapshotterTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/CpuPerformanceSnapshotterTest.kt
@@ -30,6 +30,7 @@ import org.oppia.android.testing.threading.TestCoroutineDispatchers
 import org.oppia.android.testing.threading.TestDispatcherModule
 import org.oppia.android.testing.time.FakeOppiaClock
 import org.oppia.android.testing.time.FakeOppiaClockModule
+import org.oppia.android.util.caching.AssetModule
 import org.oppia.android.util.data.DataProvidersInjector
 import org.oppia.android.util.data.DataProvidersInjectorProvider
 import org.oppia.android.util.locale.LocaleProdModule
@@ -486,7 +487,7 @@ class CpuPerformanceSnapshotterTest {
       NetworkConnectionUtilDebugModule::class, LocaleProdModule::class, FakeOppiaClockModule::class,
       TestPlatformParameterModule::class, PlatformParameterSingletonModule::class,
       LoggingIdentifierModule::class, SyncStatusTestModule::class,
-      CpuPerformanceSnapshotterModule::class, ApplicationLifecycleModule::class
+      CpuPerformanceSnapshotterModule::class, ApplicationLifecycleModule::class, AssetModule::class
     ]
   )
   interface TestApplicationComponent : DataProvidersInjector {
diff --git a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/testing/BUILD.bazel b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/testing/BUILD.bazel
new file mode 100644
index 00000000000..0d317321c64
--- /dev/null
+++ b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/testing/BUILD.bazel
@@ -0,0 +1,41 @@
+"""
+Tests for test-only app analytics logging support components.
+"""
+
+load("@dagger//:workspace_defs.bzl", "dagger_rules")
+load("//:oppia_android_test.bzl", "oppia_android_test")
+
+oppia_android_test(
+    name = "FakeLogSchedulerTest",
+    srcs = ["FakeLogSchedulerTest.kt"],
+    custom_package = "org.oppia.android.domain.oppialogger.analytics.testing",
+    test_class = "org.oppia.android.domain.oppialogger.analytics.testing.FakeLogSchedulerTest",
+    test_manifest = "//domain:test_manifest",
+    deps = [
+        ":dagger",
+        "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:cpu_module",
+        "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:prod_module",
+        "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/testing:fake_log_scheduler",
+        "//testing",
+        "//testing/src/main/java/org/oppia/android/testing/data:data_provider_test_monitor",
+        "//testing/src/main/java/org/oppia/android/testing/platformparameter:test_module",
+        "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module",
+        "//testing/src/main/java/org/oppia/android/testing/threading:test_coroutine_dispatchers",
+        "//testing/src/main/java/org/oppia/android/testing/threading:test_module",
+        "//testing/src/main/java/org/oppia/android/testing/time:test_module",
+        "//third_party:androidx_test_ext_junit",
+        "//third_party:androidx_work_work-testing",
+        "//third_party:com_google_truth_truth",
+        "//third_party:junit_junit",
+        "//third_party:org_mockito_mockito-core",
+        "//third_party:org_robolectric_robolectric",
+        "//third_party:robolectric_android-all",
+        "//utility/src/main/java/org/oppia/android/util/caching:asset_prod_module",
+        "//utility/src/main/java/org/oppia/android/util/locale:prod_module",
+        "//utility/src/main/java/org/oppia/android/util/logging/performancemetrics:performance_metrics_configurations_module",
+        "//utility/src/main/java/org/oppia/android/util/networking:debug_module",
+        "//utility/src/main/java/org/oppia/android/util/networking:prod_module",
+    ],
+)
+
+dagger_rules()
diff --git a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/testing/FakeLogSchedulerTest.kt b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/testing/FakeLogSchedulerTest.kt
index bf49005ca20..d05034cbd5f 100644
--- a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/testing/FakeLogSchedulerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/testing/FakeLogSchedulerTest.kt
@@ -33,6 +33,7 @@ import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModu
 import org.oppia.android.testing.TestLogReportingModule
 import org.oppia.android.testing.robolectric.RobolectricModule
 import org.oppia.android.testing.threading.TestDispatcherModule
+import org.oppia.android.util.caching.AssetModule
 import org.oppia.android.util.data.DataProvidersInjector
 import org.oppia.android.util.data.DataProvidersInjectorProvider
 import org.oppia.android.util.locale.LocaleProdModule
@@ -181,7 +182,7 @@ class FakeLogSchedulerTest {
       OppiaClockModule::class, NetworkConnectionUtilProdModule::class, TestLogStorageModule::class,
       PlatformParameterModule::class, PlatformParameterSingletonModule::class,
       SyncStatusModule::class, ApplicationLifecycleModule::class, LoggingIdentifierModule::class,
-      CpuPerformanceSnapshotterModule::class
+      CpuPerformanceSnapshotterModule::class, AssetModule::class
     ]
   )
   interface TestApplicationComponent : DataProvidersInjector {

From c4ad811d18b2d2c8ccc571b2d4c025f3910e62cb Mon Sep 17 00:00:00 2001
From: Ben Henning <ben@oppia.org>
Date: Tue, 31 Jan 2023 09:27:33 -0800
Subject: [PATCH 26/38] Fix broken Gradle tests.

---
 .../domain/exploration/ExplorationProgressControllerTest.kt    | 3 +++
 1 file changed, 3 insertions(+)

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 24883f17806..4b4b4d0ae4e 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
@@ -2476,6 +2476,7 @@ class ExplorationProgressControllerTest {
   }
 
   @Test
+  @RunOn(buildEnvironments = [BuildEnvironment.BAZEL])
   fun testUpdateLanguageMidLesson_englishToSwahili_updatesProfilesContentLanguage() {
     logIntoAnalyticsReadyAdminProfile()
     updateContentLanguage(profileId, OppiaLanguage.ENGLISH)
@@ -2521,6 +2522,7 @@ class ExplorationProgressControllerTest {
   }
 
   @Test
+  @RunOn(buildEnvironments = [BuildEnvironment.BAZEL])
   fun testUpdateLanguageMidLesson_englishToSwahili_diffProfile_doesNotChangeOtherProfilesLang() {
     val englishProfileId = ProfileId.newBuilder().apply { internalId = 1 }.build()
     val arabicProfileId = ProfileId.newBuilder().apply { internalId = 2 }.build()
@@ -2547,6 +2549,7 @@ class ExplorationProgressControllerTest {
   }
 
   @Test
+  @RunOn(buildEnvironments = [BuildEnvironment.BAZEL])
   fun testUpdateLanguageMidLesson_swahiliToEnglish_updatesProfilesContentLanguage() {
     logIntoAnalyticsReadyAdminProfile()
     updateContentLanguage(profileId, OppiaLanguage.SWAHILI)

From a8f24c3341d2079319bb780a8f053a7b4daaa4e3 Mon Sep 17 00:00:00 2001
From: Ben Henning <ben@oppia.org>
Date: Tue, 28 Feb 2023 15:55:28 -0800
Subject: [PATCH 27/38] Update versions for a Kenya alpha re-release.

Also, fix the version code ordering for KitKat/Lollipop versions
(Lollipop should always take priority).
---
 version.bzl | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/version.bzl b/version.bzl
index 216ee80ed8c..d3c570eac3d 100644
--- a/version.bzl
+++ b/version.bzl
@@ -1,19 +1,22 @@
 """
 Defines the latest version of the Oppia Android app.
 
-Note that version codes must be ordered such that dev < alpha, and kitkat < lollipop+. This will
+Note that version codes must be ordered such that dev > alpha, and kitkat < lollipop+. This will
 ensure that the Play Store provides users with the correct version of the app in situations where
 their device qualifies for more than one choice.
+
+More unstable flavors of the app are higher version codes since they represent "newer" versions of
+the app (that are potentially not broadly released yet).
 """
 
 MAJOR_VERSION = 0
 MINOR_VERSION = 10
 
 # TODO(#4419): Remove the Kenya-specific alpha version code.
-OPPIA_DEV_KITKAT_VERSION_CODE = 68
-OPPIA_DEV_VERSION_CODE = 67
-OPPIA_ALPHA_KITKAT_VERSION_CODE = 66
-OPPIA_ALPHA_VERSION_CODE = 65
-OPPIA_ALPHA_KENYA_VERSION_CODE = 64
-OPPIA_BETA_VERSION_CODE = 63
-OPPIA_GA_VERSION_CODE = 62
+OPPIA_DEV_VERSION_CODE = 75
+OPPIA_DEV_KITKAT_VERSION_CODE = 74
+OPPIA_ALPHA_VERSION_CODE = 73
+OPPIA_ALPHA_KITKAT_VERSION_CODE = 72
+OPPIA_ALPHA_KENYA_VERSION_CODE = 71
+OPPIA_BETA_VERSION_CODE = 70
+OPPIA_GA_VERSION_CODE = 69

From 84bd2f160d4e6625d72125374e4244b133daaee6 Mon Sep 17 00:00:00 2001
From: Ben Henning <ben@oppia.org>
Date: Thu, 9 Mar 2023 18:31:25 -0800
Subject: [PATCH 28/38] Main follow-up alpha MR6 fixes.

This does a lot of stuff (that will be more clearly represented in the
corresponding PR), but it includes:
- An updated learner profile screen that includes a clearer sync status,
a share button that also shares event logs stats and the logs
themselves, event stats, and a button to force log uploads.
- Fix to PersistentCacheStore that prevents potential log duplication.
- Fix to AnalyticsController that could result in logs being lost when
they're supposed to be uploaded.
- Long-term persistence of events that have been uploaded to ensure that
they can be tracked & shared.
---
 app/BUILD.bazel                               |   4 +-
 app/src/main/AndroidManifest.xml              |   1 +
 .../app/activity/ActivityComponentImpl.kt     |   2 +
 .../ControlButtonsViewModel.kt                | 217 ++++
 .../ProfileAndDeviceIdFragmentPresenter.kt    |  10 +-
 .../ProfileLearnerIdItemViewModel.kt          | 160 ++-
 .../learneranalytics/ProfileListViewModel.kt  |  18 +-
 .../learneranalytics/ShareIdsViewModel.kt     |  58 -
 .../SyncStatusItemViewModel.kt                |  10 +-
 .../oppia/android/app/application/BUILD.bazel |   1 -
 .../app/application/alphakenya/BUILD.bazel    |   2 +-
 .../CircularProgressIndicatorAdapters.java    |  27 +
 ...arProgressIndicatorAdaptersTestActivity.kt |  40 +
 ...rProgressIndicatorAdaptersTestViewModel.kt |  23 +
 ...gress_indicator_adapters_test_activity.xml |  32 +
 .../layout/profile_list_control_buttons.xml   |  63 ++
 .../layout/profile_list_learner_id_item.xml   | 172 ++-
 .../layout/profile_list_share_ids_item.xml    |  27 -
 .../main/res/values/untranslated_strings.xml  |  12 +-
 .../learneranalytics/BUILD.bazel              |   2 +
 .../ProfileAndDeviceIdFragmentTest.kt         | 595 +++++++++--
 .../oppia/android/app/databinding/BUILD.bazel | 103 +-
 .../CircularProgressIndicatorAdaptersTest.kt  | 329 ++++++
 .../android/data/persistence/BUILD.bazel      |   2 +-
 .../data/persistence/PersistentCacheStore.kt  |   6 +
 .../persistence/PersistentCacheStoreTest.kt   |  88 +-
 domain/BUILD.bazel                            |   2 +-
 .../analytics/AnalyticsController.kt          | 201 +++-
 .../domain/oppialogger/analytics/BUILD.bazel  |   2 +
 .../oppialogger/loguploader/BUILD.bazel       |   7 +
 .../loguploader/LogUploadWorker.kt            |  14 +-
 .../oppia/android/domain/profile/BUILD.bazel  |   1 +
 .../android/domain/clipboard/BUILD.bazel      |   2 +-
 .../analytics/AnalyticsControllerTest.kt      | 422 +++++++-
 .../domain/oppialogger/analytics/BUILD.bazel  |   2 +-
 .../oppialogger/loguploader/BUILD.bazel       |  76 ++
 .../loguploader/LogUploadWorkerTest.kt        | 122 ++-
 model/src/main/proto/BUILD.bazel              |   1 +
 model/src/main/proto/oppia_logger.proto       |  13 +-
 model/src/main/proto/test.proto               |   2 +
 .../accessibility_label_exemptions.textproto  |   1 +
 .../file_content_validation_checks.textproto  |   5 +-
 .../assets/kdoc_validity_exemptions.textproto |   1 +
 scripts/assets/test_file_exemptions.textproto |   5 +-
 .../testing/data/DataProviderTestMonitor.kt   |  55 +-
 .../oppia/android/testing/logging/BUILD.bazel |   7 +-
 .../testing/logging/EventLogSubject.kt        |   7 +
 .../testing/logging/FakeSyncStatusManager.kt  |  37 -
 .../testing/logging/SyncStatusTestModule.kt   |   2 +-
 .../testing/logging/TestSyncStatusManager.kt  | 120 +++
 .../testing/threading/TestDispatcherModule.kt |   4 +-
 .../data/DataProviderTestMonitorTest.kt       | 181 +++-
 .../oppia/android/testing/logging/BUILD.bazel |  14 +-
 .../logging/FakeSyncStatusManagerTest.kt      | 210 ----
 .../logging/SyncStatusTestModuleTest.kt       |   4 +-
 .../logging/TestSyncStatusManagerTest.kt      | 997 ++++++++++++++++++
 .../oppia/android/util/logging/BUILD.bazel    |   5 +
 .../android/util/logging/SyncStatusManager.kt |  48 +-
 .../util/logging/SyncStatusManagerImpl.kt     |  95 +-
 .../PlatformParameterConstants.kt             |   3 +-
 .../android/util/threading/AtomicEnum.kt      |  45 +
 .../oppia/android/util/threading/BUILD.bazel  |  10 +-
 .../oppia/android/util/logging/BUILD.bazel    |  19 +
 .../util/logging/SyncStatusManagerImplTest.kt |  97 +-
 .../util/logging/SyncStatusManagerTestBase.kt | 364 +++++++
 .../android/util/threading/AtomicEnumTest.kt  | 212 ++++
 .../oppia/android/util/threading/BUILD.bazel  |  19 +
 67 files changed, 4643 insertions(+), 795 deletions(-)
 create mode 100644 app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ControlButtonsViewModel.kt
 delete mode 100644 app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ShareIdsViewModel.kt
 create mode 100644 app/src/main/java/org/oppia/android/app/databinding/CircularProgressIndicatorAdapters.java
 create mode 100644 app/src/main/java/org/oppia/android/app/testing/CircularProgressIndicatorAdaptersTestActivity.kt
 create mode 100644 app/src/main/java/org/oppia/android/app/testing/CircularProgressIndicatorAdaptersTestViewModel.kt
 create mode 100644 app/src/main/res/layout/circular_progress_indicator_adapters_test_activity.xml
 create mode 100644 app/src/main/res/layout/profile_list_control_buttons.xml
 delete mode 100644 app/src/main/res/layout/profile_list_share_ids_item.xml
 create mode 100644 app/src/sharedTest/java/org/oppia/android/app/databinding/CircularProgressIndicatorAdaptersTest.kt
 create mode 100644 domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/BUILD.bazel
 delete mode 100644 testing/src/main/java/org/oppia/android/testing/logging/FakeSyncStatusManager.kt
 create mode 100644 testing/src/main/java/org/oppia/android/testing/logging/TestSyncStatusManager.kt
 delete mode 100644 testing/src/test/java/org/oppia/android/testing/logging/FakeSyncStatusManagerTest.kt
 create mode 100644 testing/src/test/java/org/oppia/android/testing/logging/TestSyncStatusManagerTest.kt
 create mode 100644 utility/src/main/java/org/oppia/android/util/threading/AtomicEnum.kt
 create mode 100644 utility/src/test/java/org/oppia/android/util/logging/SyncStatusManagerTestBase.kt
 create mode 100644 utility/src/test/java/org/oppia/android/util/threading/AtomicEnumTest.kt
 create mode 100644 utility/src/test/java/org/oppia/android/util/threading/BUILD.bazel

diff --git a/app/BUILD.bazel b/app/BUILD.bazel
index b0f77c14f9d..f2648add9b6 100644
--- a/app/BUILD.bazel
+++ b/app/BUILD.bazel
@@ -186,10 +186,10 @@ DATABINDING_LAYOUTS = ["src/main/res/layout*/**"]
 # keep sorted
 VIEW_MODELS_WITH_RESOURCE_IMPORTS = [
     "src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionViewModel.kt",
+    "src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ControlButtonsViewModel.kt",
     "src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/DeviceIdItemViewModel.kt",
     "src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileLearnerIdItemViewModel.kt",
     "src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileListViewModel.kt",
-    "src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ShareIdsViewModel.kt",
     "src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/SyncStatusItemViewModel.kt",
     "src/main/java/org/oppia/android/app/devoptions/forcenetworktype/ForceNetworkTypeViewModel.kt",
     "src/main/java/org/oppia/android/app/devoptions/mathexpressionparser/MathExpressionParserViewModel.kt",
@@ -344,6 +344,7 @@ VIEW_MODELS = [
     "src/main/java/org/oppia/android/app/story/StoryViewModel.kt",
     "src/main/java/org/oppia/android/app/testing/BindableAdapterTestDataModel.kt",
     "src/main/java/org/oppia/android/app/testing/BindableAdapterTestViewModel.kt",
+    "src/main/java/org/oppia/android/app/testing/CircularProgressIndicatorAdaptersTestViewModel.kt",
     "src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardViewModel.kt",
     "src/main/java/org/oppia/android/app/topic/lessons/TopicLessonViewModel.kt",
     "src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsItemViewModel.kt",
@@ -471,6 +472,7 @@ BINDING_ADAPTERS_WITH_RESOURCE_IMPORTS = [
 
 # keep sorted
 BINDING_ADAPTERS = [
+    "src/main/java/org/oppia/android/app/databinding/CircularProgressIndicatorAdapters.java",
     "src/main/java/org/oppia/android/app/databinding/ConstraintLayoutAdapters.java",
     "src/main/java/org/oppia/android/app/databinding/EditTextBindingAdapters.java",
     "src/main/java/org/oppia/android/app/databinding/GuidelineBindingAdapters.java",
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0c112106d33..9bff4bef5d9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -196,6 +196,7 @@
       android:theme="@style/OppiaThemeWithoutActionBar" />
     <activity android:name=".app.testing.AudioFragmentTestActivity" />
     <activity android:name=".app.testing.BindableAdapterTestActivity" />
+    <activity android:name=".app.testing.CircularProgressIndicatorAdaptersTestActivity" />
     <activity android:name=".app.testing.ConceptCardFragmentTestActivity" />
     <activity android:name=".app.testing.DragDropTestActivity" />
     <activity android:name=".app.testing.DrawableBindingAdaptersTestActivity" />
diff --git a/app/src/main/java/org/oppia/android/app/activity/ActivityComponentImpl.kt b/app/src/main/java/org/oppia/android/app/activity/ActivityComponentImpl.kt
index 58dd5aef77c..37422bcd210 100644
--- a/app/src/main/java/org/oppia/android/app/activity/ActivityComponentImpl.kt
+++ b/app/src/main/java/org/oppia/android/app/activity/ActivityComponentImpl.kt
@@ -56,6 +56,7 @@ import org.oppia.android.app.splash.SplashActivity
 import org.oppia.android.app.story.StoryActivity
 import org.oppia.android.app.testing.AdministratorControlsFragmentTestActivity
 import org.oppia.android.app.testing.AudioFragmentTestActivity
+import org.oppia.android.app.testing.CircularProgressIndicatorAdaptersTestActivity
 import org.oppia.android.app.testing.ConceptCardFragmentTestActivity
 import org.oppia.android.app.testing.DragDropTestActivity
 import org.oppia.android.app.testing.DrawableBindingAdaptersTestActivity
@@ -118,6 +119,7 @@ interface ActivityComponentImpl :
   fun inject(appVersionActivity: AppVersionActivity)
   fun inject(audioFragmentTestActivity: AudioFragmentTestActivity)
   fun inject(audioLanguageActivity: AudioLanguageActivity)
+  fun inject(circularProgressAdaptersTestActivity: CircularProgressIndicatorAdaptersTestActivity)
   fun inject(completedStoryListActivity: CompletedStoryListActivity)
   fun inject(conceptCardFragmentTestActivity: ConceptCardFragmentTestActivity)
   fun inject(developerOptionsActivity: DeveloperOptionsActivity)
diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ControlButtonsViewModel.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ControlButtonsViewModel.kt
new file mode 100644
index 00000000000..50426c3628f
--- /dev/null
+++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ControlButtonsViewModel.kt
@@ -0,0 +1,217 @@
+package org.oppia.android.app.administratorcontrols.learneranalytics
+
+import android.annotation.SuppressLint
+import android.content.ActivityNotFoundException
+import android.content.Intent
+import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.Transformations
+import com.google.protobuf.MessageLite
+import org.oppia.android.app.administratorcontrols.learneranalytics.ProfileListViewModel.ProfileListItemViewModel
+import org.oppia.android.app.model.OppiaEventLogs
+import org.oppia.android.domain.oppialogger.OppiaLogger
+import org.oppia.android.domain.oppialogger.analytics.AnalyticsController
+import org.oppia.android.util.data.AsyncResult
+import org.oppia.android.util.data.DataProviders.Companion.toLiveData
+import org.oppia.android.util.logging.SyncStatusManager
+import org.oppia.android.util.logging.SyncStatusManager.SyncStatus
+import java.io.ByteArrayOutputStream
+import java.util.Base64
+import java.util.zip.GZIPOutputStream
+import javax.inject.Inject
+
+/**
+ * [ProfileListItemViewModel] that represents the portion of the learner analytics admin page which
+ * provides some control buttons for ID/logs sharing and syncing.
+ */
+@SuppressLint("StaticFieldLeak") // False positive (Android doesn't manage this model's lifecycle).
+class ControlButtonsViewModel private constructor(
+  private val oppiaLogger: OppiaLogger,
+  private val activity: AppCompatActivity,
+  private val analyticsController: AnalyticsController,
+  private val syncStatusManager: SyncStatusManager,
+  private val viewModels: List<ProfileListItemViewModel>
+) : ProfileListItemViewModel(ProfileListViewModel.ProfileListItemViewType.SHARE_IDS) {
+  private var monitoredUploadProgress: LiveData<ForceSyncProgress> =
+    MutableLiveData(ForceSyncProgress())
+
+  /** The current [ForceSyncProgress], as affected by [onUploadLogsNowButtonClicked]. */
+  val forceUploadProgress: LiveData<ForceSyncProgress> get() = monitoredUploadProgress
+
+  /** The current [SyncStatus] of event logs. */
+  val syncStatus: LiveData<SyncStatus> by lazy {
+    Transformations.map(syncStatusManager.getSyncStatus().toLiveData(), this::processSyncStatus)
+  }
+
+  /**
+   * Indicates the user wants to share learner & device IDs, along with event log metrics, with
+   * another app.
+   */
+  fun onShareButtonClicked() {
+    // Reference: https://developer.android.com/guide/components/intents-common#Email from
+    // https://stackoverflow.com/a/15022153/3689782.
+    val logs = retrieveEventLogs(viewModels.filterIsInstance<ProfileLearnerIdItemViewModel>())
+    val sharedText = viewModels.mapNotNull { viewModel ->
+      when (viewModel) {
+        is DeviceIdItemViewModel -> listOf("Oppia app installation ID: ${viewModel.deviceId.value}")
+        is ProfileLearnerIdItemViewModel -> {
+          val profile = viewModel.profile
+          val stats = viewModel.uploadEventsStats.value
+          val learnerStats = stats?.learnerStats
+          val uncategorizedStats = stats?.uncategorizedStats
+          listOfNotNull(
+            "- Profile name: ${profile.name}, learner ID: ${profile.learnerId}",
+            learnerStats?.awaitingUploadEventCountText?.let { "  - Uploading learner events: $it" },
+            learnerStats?.uploadedEventCountText?.let { "  - Uploaded learner events: $it" },
+            uncategorizedStats?.awaitingUploadEventCountText?.let {
+              "  - Uploading uncategorized events: $it"
+            },
+            uncategorizedStats?.uploadedEventCountText?.let {
+              "  - Uploaded uncategorized events: $it"
+            }
+          )
+        }
+        is SyncStatusItemViewModel -> {
+          listOf(
+            "Current sync status: ${viewModel.syncStatus.value}.",
+            "Encoded event logs:"
+          ) + (logs?.toCompressedBase64()?.chunked(BASE64_LINE_WRAP_LIMIT) ?: listOf("Missing"))
+        }
+        else -> null
+      }
+    }.flatten().joinToString(separator = "\n")
+    try {
+      activity.startActivity(
+        Intent(Intent.ACTION_SEND).apply {
+          type = "text/plain"
+          addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+          putExtra(Intent.EXTRA_TEXT, sharedText)
+        }
+      )
+    } catch (e: ActivityNotFoundException) {
+      oppiaLogger.e("ControlButtonsViewModel", "No activity found to receive shared IDs.", e)
+    }
+  }
+
+  /**
+   * Indicates that the user wishes to upload any pending event logs immediately, rather than
+   * waiting for the app to schedule an event upload.
+   *
+   * The status of the upload result can be observed via [forceUploadProgress].
+   *
+   * [canStartUploadingLogs] should be used to determine whether now is a valid time to start
+   * uploading logs.
+   */
+  fun onUploadLogsNowButtonClicked() {
+    monitoredUploadProgress =
+      Transformations.map(
+        analyticsController.uploadEventLogs().toLiveData(), this::processUploadedEventLogs
+      )
+    notifyChange() // Recompute bindings since the live data instance has changed.
+  }
+
+  /**
+   * Returns whether current conditions, per [isCurrentlyUploading] and [syncStatus], indicate that
+   * there are events that can be manually force-uploaded by the user.
+   *
+   * Note that both [isCurrentlyUploading] and [syncStatus] permit null values because of an issue
+   * with databinding wherein multiple [LiveData]s bound at the same time may result in one or both
+   * of the values correspond to the *current* [LiveData] value which may be null if the [LiveData]
+   * hasn't been updated yet (even if its type indicates non-nullness). Permitting null allows the
+   * implementation to work around this case by assuming that either value missing means no
+   * determination can be made whether logs can start being uploaded.
+   */
+  fun canStartUploadingLogs(isCurrentlyUploading: Boolean?, syncStatus: SyncStatus?): Boolean =
+    isCurrentlyUploading == false && syncStatus == SyncStatus.WAITING_TO_START_UPLOADING
+
+  private fun retrieveEventLogs(viewModels: List<ProfileLearnerIdItemViewModel>): OppiaEventLogs? =
+    viewModels.firstOrNull()?.oppiaEventLogs?.value?.let { processEventLogs(it) }
+
+  private fun processUploadedEventLogs(result: AsyncResult<Pair<Int, Int>>): ForceSyncProgress {
+    return when (result) {
+      is AsyncResult.Pending -> ForceSyncProgress(eventsUploaded = 0, totalEventsToUpload = 0)
+      is AsyncResult.Success -> {
+        val (currentUploadedEventCount, totalEventCount) = result.value
+        ForceSyncProgress(currentUploadedEventCount, totalEventCount)
+      }
+      is AsyncResult.Failure -> ForceSyncProgress().also {
+        oppiaLogger.e(
+          "ControlButtonsViewModel", "Encountered failure while uploading events.", result.error
+        )
+      }
+    }
+  }
+
+  private fun processSyncStatus(result: AsyncResult<SyncStatus>): SyncStatus {
+    return when (result) {
+      is AsyncResult.Pending -> SyncStatus.INITIAL_UNKNOWN
+      is AsyncResult.Success -> result.value
+      is AsyncResult.Failure -> SyncStatus.INITIAL_UNKNOWN.also {
+        oppiaLogger.e(
+          "ControlButtonsViewModel",
+          "Encountered failure while retrieving sync status.",
+          result.error
+        )
+      }
+    }
+  }
+
+  private fun processEventLogs(result: AsyncResult<OppiaEventLogs>): OppiaEventLogs? {
+    return when (result) {
+      is AsyncResult.Pending -> null
+      is AsyncResult.Success -> result.value
+      is AsyncResult.Failure -> {
+        oppiaLogger.e(
+          "ControlButtonsViewModel", "Encountered failure while on-disk event logs.", result.error
+        )
+        null
+      }
+    }
+  }
+
+  /**
+   * Progress representation structure that provides the UI with an indication of how much of an
+   * upload event operation has completed, and how much remains.
+   *
+   * Note that a [totalEventsToUpload] value of 0 indicates there are 0 left in the **current**
+   * operation, but there may have been events to upload in the past.
+   *
+   * @property eventsUploaded the number of events that have uploaded so far
+   * @property totalEventsToUpload the total number of events to upload, or none
+   */
+  data class ForceSyncProgress(val eventsUploaded: Int = 0, val totalEventsToUpload: Int = -1) {
+    /** Returns whether there are events that can be uploaded. */
+    fun hasEventsToUpload(): Boolean = totalEventsToUpload != -1
+
+    /** Returns whether there are events currently being uploaded. */
+    fun isCurrentlyUploading(): Boolean = eventsUploaded < totalEventsToUpload
+  }
+
+  /** Factory for creating new [ControlButtonsViewModel]s. */
+  class Factory @Inject constructor(
+    private val oppiaLogger: OppiaLogger,
+    private val activity: AppCompatActivity,
+    private val analyticsController: AnalyticsController,
+    private val syncStatusManager: SyncStatusManager
+  ) {
+    /** Returns a new [ControlButtonsViewModel]. */
+    fun create(viewModels: List<ProfileListItemViewModel>): ControlButtonsViewModel {
+      return ControlButtonsViewModel(
+        oppiaLogger, activity, analyticsController, syncStatusManager, viewModels
+      )
+    }
+  }
+
+  private companion object {
+    private const val BASE64_LINE_WRAP_LIMIT = 80
+
+    // Copied from ProtoStringEncoder (which isn't available in production code).
+    private fun <M : MessageLite> M.toCompressedBase64(): String {
+      val compressedMessage = ByteArrayOutputStream().also { byteOutputStream ->
+        GZIPOutputStream(byteOutputStream).use(::writeTo)
+      }.toByteArray()
+      return Base64.getEncoder().encodeToString(compressedMessage)
+    }
+  }
+}
diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdFragmentPresenter.kt
index dd008b8aaad..07dc3cd210e 100644
--- a/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdFragmentPresenter.kt
@@ -8,9 +8,9 @@ import org.oppia.android.app.administratorcontrols.learneranalytics.ProfileListV
 import org.oppia.android.app.administratorcontrols.learneranalytics.ProfileListViewModel.ProfileListItemViewType
 import org.oppia.android.app.recyclerview.BindableAdapter
 import org.oppia.android.databinding.ProfileAndDeviceIdFragmentBinding
+import org.oppia.android.databinding.ProfileListControlButtonsBinding
 import org.oppia.android.databinding.ProfileListDeviceIdItemBinding
 import org.oppia.android.databinding.ProfileListLearnerIdItemBinding
-import org.oppia.android.databinding.ProfileListShareIdsItemBinding
 import org.oppia.android.databinding.ProfileListSyncStatusItemBinding
 import javax.inject.Inject
 
@@ -47,7 +47,7 @@ class ProfileAndDeviceIdFragmentPresenter @Inject constructor(
         is DeviceIdItemViewModel -> ProfileListItemViewType.DEVICE_ID
         is ProfileLearnerIdItemViewModel -> ProfileListItemViewType.LEARNER_ID
         is SyncStatusItemViewModel -> ProfileListItemViewType.SYNC_STATUS
-        is ShareIdsViewModel -> ProfileListItemViewType.SHARE_IDS
+        is ControlButtonsViewModel -> ProfileListItemViewType.SHARE_IDS
         else -> error("Encountered unexpected view model: $viewModel")
       }
     }.registerViewDataBinder(
@@ -67,9 +67,9 @@ class ProfileAndDeviceIdFragmentPresenter @Inject constructor(
       transformViewModel = { it as SyncStatusItemViewModel }
     ).registerViewDataBinder(
       viewType = ProfileListItemViewType.SHARE_IDS,
-      inflateDataBinding = ProfileListShareIdsItemBinding::inflate,
-      setViewModel = ProfileListShareIdsItemBinding::setViewModel,
-      transformViewModel = { it as ShareIdsViewModel }
+      inflateDataBinding = ProfileListControlButtonsBinding::inflate,
+      setViewModel = ProfileListControlButtonsBinding::setViewModel,
+      transformViewModel = { it as ControlButtonsViewModel }
     ).build()
   }
 }
diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileLearnerIdItemViewModel.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileLearnerIdItemViewModel.kt
index 8fbd19a81a4..db8106e05f6 100644
--- a/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileLearnerIdItemViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileLearnerIdItemViewModel.kt
@@ -5,11 +5,15 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
 import org.oppia.android.R
 import org.oppia.android.app.administratorcontrols.learneranalytics.ProfileListViewModel.ProfileListItemViewModel
+import org.oppia.android.app.model.EventLog
+import org.oppia.android.app.model.OppiaEventLogs
 import org.oppia.android.app.model.Profile
+import org.oppia.android.app.model.ProfileId
 import org.oppia.android.app.translation.AppLanguageResourceHandler
 import org.oppia.android.domain.clipboard.ClipboardController
 import org.oppia.android.domain.clipboard.ClipboardController.CurrentClip
 import org.oppia.android.domain.oppialogger.OppiaLogger
+import org.oppia.android.domain.oppialogger.analytics.AnalyticsController
 import org.oppia.android.util.data.AsyncResult
 import org.oppia.android.util.data.DataProviders.Companion.toLiveData
 import javax.inject.Inject
@@ -24,6 +28,7 @@ class ProfileLearnerIdItemViewModel private constructor(
   val profile: Profile,
   private val clipboardController: ClipboardController,
   private val resourceHandler: AppLanguageResourceHandler,
+  private val analyticsController: AnalyticsController,
   private val oppiaLogger: OppiaLogger,
   private val fragment: Fragment
 ) : ProfileListItemViewModel(ProfileListViewModel.ProfileListItemViewType.LEARNER_ID) {
@@ -32,6 +37,16 @@ class ProfileLearnerIdItemViewModel private constructor(
     Transformations.map(clipboardController.getCurrentClip().toLiveData(), this::processCurrentClip)
   }
 
+  /** The current [OppiaEventLogs] that have been recorded over the lifetime of the app. */
+  val oppiaEventLogs: LiveData<AsyncResult<OppiaEventLogs>> by lazy {
+    analyticsController.getEventLogStore().toLiveData()
+  }
+
+  /** The current [UploadEventsStats] that represent the current profile's event upload stats. */
+  val uploadEventsStats: LiveData<UploadEventsStats> by lazy {
+    Transformations.map(oppiaEventLogs, this::processEventLogs)
+  }
+
   /**
    * Copies the analytics learner ID associated with this model's [profile] to the user's clipboard.
    */
@@ -51,6 +66,129 @@ class ProfileLearnerIdItemViewModel private constructor(
     }
   }
 
+  /**
+   * Returns a textual representation of the number of events awaiting upload for the profile
+   * corresponding to this view model.
+   */
+  fun computeEventsWaitingUploadLabelText(): String {
+    return resourceHandler.getStringInLocaleWithWrapping(
+      R.string.learner_analytics_learner_events_waiting_upload, profile.name
+    )
+  }
+
+  /**
+   * Returns a textual representation of the number of events that have been uploaded for the
+   * profile corresponding to this view model.
+   */
+  fun computeEventsUploadedLabelText(): String {
+    return resourceHandler.getStringInLocaleWithWrapping(
+      R.string.learner_analytics_learner_events_uploaded, profile.name
+    )
+  }
+
+  /**
+   * Stats structure to provide context on the synchronization & uploading information of a specific
+   * profile's events.
+   *
+   * @property learnerStats the stats corresponding to learner-specific events
+   * @property uncategorizedStats the stats corresponding to events not tied to an individual
+   *     profile, nor ``null`` if these aren't computed for this user
+   */
+  data class UploadEventsStats(
+    val learnerStats: CategorizedEventStats,
+    val uncategorizedStats: CategorizedEventStats?
+  ) {
+    /** Returns whether this stats report includes [uncategorizedStats]. */
+    fun hasUncategorizedStats(): Boolean = uncategorizedStats != null
+
+    companion object {
+      /**
+       * Returns a new [UploadEventsStats] with event stats retrieved from [oppiaEventLogs] for the
+       * specified [profile] (and localized per [resourceHandler]).
+       *
+       * Note that only admin profiles will include [uncategorizedStats] in the returned stats
+       * object.
+       */
+      fun createFrom(
+        resourceHandler: AppLanguageResourceHandler,
+        profile: Profile,
+        oppiaEventLogs: OppiaEventLogs
+      ): UploadEventsStats {
+        val logsToUploadMap = oppiaEventLogs.eventLogsToUploadList.associateByProfileId()
+        val uploadedLogsMap = oppiaEventLogs.uploadedEventLogsList.associateByProfileId()
+        return UploadEventsStats(
+          learnerStats = CategorizedEventStats.createFrom(
+            resourceHandler, profile.id, logsToUploadMap, uploadedLogsMap
+          ),
+          uncategorizedStats = if (profile.isAdmin) {
+            // Admins should also show uncategorized stats.
+            CategorizedEventStats.createFrom(
+              resourceHandler, profileId = null, logsToUploadMap, uploadedLogsMap
+            )
+          } else null
+        )
+      }
+
+      /**
+       * Returns a new [UploadEventsStats] with unknown event counts filled in (localized per
+       * [resourceHandler]).
+       */
+      fun createFromUnknown(resourceHandler: AppLanguageResourceHandler): UploadEventsStats {
+        val unknownCountText =
+          resourceHandler.getStringInLocale(R.string.learner_analytics_unknown_event_count)
+        return UploadEventsStats(
+          learnerStats = CategorizedEventStats(
+            awaitingUploadEventCountText = unknownCountText,
+            uploadedEventCountText = unknownCountText
+          ),
+          uncategorizedStats = null
+        )
+      }
+    }
+  }
+
+  /**
+   * Represents event counts awaiting & completing upload attempts for a specific category of events
+   * (such as being specific to a particular learner, or general for all events not tied to
+   * profiles).
+   *
+   * @property awaitingUploadEventCountText a textual representation of the number of events cached
+   *     but not yet uploaded
+   * @property uploadedEventCountText a textual representation of the number of events that have
+   *     been uploaded to the remote analytics service
+   */
+  data class CategorizedEventStats(
+    val awaitingUploadEventCountText: String,
+    val uploadedEventCountText: String
+  ) {
+    companion object {
+      /**
+       * Computes a new [CategorizedEventStats] with computed logs to upload/logs that have been
+       * uploaded.
+       *
+       * @param resourceHandler the resource handler with which to localize the count texts
+       * @param profileId the profile to which the computed stats correspond, or null if these stats
+       *     are profile-agnostic
+       * @param logsToUploadMap all events, grouped per-profile, that haven't yet been uploaded
+       * @param uploadedLogsMap all events, grouped per-profile, that been uploaded
+       * @return the new [CategorizedEventStats] with computed event logs
+       */
+      fun createFrom(
+        resourceHandler: AppLanguageResourceHandler,
+        profileId: ProfileId?,
+        logsToUploadMap: Map<ProfileId?, List<EventLog>>,
+        uploadedLogsMap: Map<ProfileId?, List<EventLog>>
+      ): CategorizedEventStats {
+        val logsToUpload = logsToUploadMap[profileId] ?: emptyList()
+        val uploadedLogs = uploadedLogsMap[profileId] ?: emptyList()
+        return CategorizedEventStats(
+          awaitingUploadEventCountText = resourceHandler.toHumanReadableString(logsToUpload.size),
+          uploadedEventCountText = resourceHandler.toHumanReadableString(uploadedLogs.size)
+        )
+      }
+    }
+  }
+
   private fun processCurrentClip(result: AsyncResult<CurrentClip>): String? {
     return if (result is AsyncResult.Success) {
       when (val clip = result.value) {
@@ -60,18 +198,38 @@ class ProfileLearnerIdItemViewModel private constructor(
     } else null
   }
 
+  private fun processEventLogs(result: AsyncResult<OppiaEventLogs>): UploadEventsStats {
+    return when (result) {
+      is AsyncResult.Pending -> UploadEventsStats.createFromUnknown(resourceHandler)
+      is AsyncResult.Success -> UploadEventsStats.createFrom(resourceHandler, profile, result.value)
+      is AsyncResult.Failure -> UploadEventsStats.createFromUnknown(resourceHandler).also {
+        oppiaLogger.e(
+          "ProfileLearnerIdItemViewModel",
+          "Encountered unexpected failure when processing event logs",
+          result.error
+        )
+      }
+    }
+  }
+
   /** Factory for creating new [ProfileLearnerIdItemViewModel]s. */
   class Factory @Inject constructor(
     private val clipboardController: ClipboardController,
     private val resourceHandler: AppLanguageResourceHandler,
+    private val analyticsController: AnalyticsController,
     private val oppiaLogger: OppiaLogger,
     private val fragment: Fragment
   ) {
     /** Returns a new [ProfileLearnerIdItemViewModel] corresponding to the specified [profile]. */
     fun create(profile: Profile): ProfileLearnerIdItemViewModel {
       return ProfileLearnerIdItemViewModel(
-        profile, clipboardController, resourceHandler, oppiaLogger, fragment
+        profile, clipboardController, resourceHandler, analyticsController, oppiaLogger, fragment
       )
     }
   }
+
+  private companion object {
+    private fun List<EventLog>.associateByProfileId(): Map<ProfileId?, List<EventLog>> =
+      groupBy { log -> log.profileId.takeIf { log.hasProfileId() } }
+  }
 }
diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileListViewModel.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileListViewModel.kt
index ff3778b85d8..d559f1bc57f 100644
--- a/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileListViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileListViewModel.kt
@@ -24,7 +24,7 @@ class ProfileListViewModel private constructor(
   private val deviceIdItemViewModelFactory: DeviceIdItemViewModel.Factory,
   private val syncStatusItemViewModelFactory: SyncStatusItemViewModel.Factory,
   private val profileLearnerIdItemViewModelFactory: ProfileLearnerIdItemViewModel.Factory,
-  private val shareIdsViewModelFactory: ShareIdsViewModel.Factory
+  private val shareIdsViewModelFactory: ControlButtonsViewModel.Factory
 ) : ObservableViewModel() {
   /** The list of [ProfileListItemViewModel] to display. */
   val profileModels: LiveData<List<ProfileListItemViewModel>> by lazy {
@@ -40,9 +40,7 @@ class ProfileListViewModel private constructor(
       is AsyncResult.Pending -> listOf()
       is AsyncResult.Failure -> {
         oppiaLogger.e(
-          "ProfileAndDeviceIdViewModel",
-          "Failed to retrieve the list of profiles",
-          profilesResult.error
+          "ProfileListViewModel", "Failed to retrieve the list of profiles", profilesResult.error
         )
         listOf()
       }
@@ -54,10 +52,10 @@ class ProfileListViewModel private constructor(
       }
     }
 
-    val idModels = listOf(deviceIdViewModel) + learnerIdModels
-    val shareIdsViewModel = shareIdsViewModelFactory.create(idModels)
     val syncStatusViewModel = syncStatusItemViewModelFactory.create()
-    return idModels + listOf(syncStatusViewModel, shareIdsViewModel)
+    val displayViewModels = listOf(deviceIdViewModel) + learnerIdModels + syncStatusViewModel
+    val controlButtonsViewModel = shareIdsViewModelFactory.create(displayViewModels)
+    return displayViewModels + controlButtonsViewModel
   }
 
   /**
@@ -83,7 +81,7 @@ class ProfileListViewModel private constructor(
     /** Corresponds to [SyncStatusItemViewModel]. */
     SYNC_STATUS,
 
-    /** Corresponds to [ShareIdsViewModel]. */
+    /** Corresponds to [ControlButtonsViewModel]. */
     SHARE_IDS
   }
 
@@ -94,7 +92,7 @@ class ProfileListViewModel private constructor(
     private val deviceIdItemViewModelFactory: DeviceIdItemViewModel.Factory,
     private val syncStatusItemViewModelFactory: SyncStatusItemViewModel.Factory,
     private val profileLearnerIdItemViewModelFactory: ProfileLearnerIdItemViewModel.Factory,
-    private val shareIdsViewModelFactory: ShareIdsViewModel.Factory
+    private val controlButtonsViewModelFactory: ControlButtonsViewModel.Factory
   ) {
     /** Returns a new [ProfileListViewModel]. */
     fun create(): ProfileListViewModel {
@@ -104,7 +102,7 @@ class ProfileListViewModel private constructor(
         deviceIdItemViewModelFactory,
         syncStatusItemViewModelFactory,
         profileLearnerIdItemViewModelFactory,
-        shareIdsViewModelFactory
+        controlButtonsViewModelFactory
       )
     }
   }
diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ShareIdsViewModel.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ShareIdsViewModel.kt
deleted file mode 100644
index 435315c705c..00000000000
--- a/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ShareIdsViewModel.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.oppia.android.app.administratorcontrols.learneranalytics
-
-import android.annotation.SuppressLint
-import android.content.ActivityNotFoundException
-import android.content.Intent
-import androidx.appcompat.app.AppCompatActivity
-import org.oppia.android.app.administratorcontrols.learneranalytics.ProfileListViewModel.ProfileListItemViewModel
-import org.oppia.android.domain.oppialogger.OppiaLogger
-import javax.inject.Inject
-
-/**
- * [ProfileListItemViewModel] that represents the portion of the learner analytics admin page which
- * provides a button to the user that allows them to share the device's installation ID, along with
- * profile IDs, to an external app for record keeping.
- */
-@SuppressLint("StaticFieldLeak") // False positive (Android doesn't manage this model's lifecycle).
-class ShareIdsViewModel private constructor(
-  private val oppiaLogger: OppiaLogger,
-  private val activity: AppCompatActivity,
-  private val viewModels: List<ProfileListItemViewModel>
-) : ProfileListItemViewModel(ProfileListViewModel.ProfileListItemViewType.SHARE_IDS) {
-  /** Indicates the user wants to share learner & the device IDs with another app. */
-  fun onShareIdsButtonClicked() {
-    // Reference: https://developer.android.com/guide/components/intents-common#Email from
-    // https://stackoverflow.com/a/15022153/3689782.
-    val sharedText = viewModels.mapNotNull { viewModel ->
-      when (viewModel) {
-        is DeviceIdItemViewModel -> "Oppia app installation ID: ${viewModel.deviceId.value}"
-        is ProfileLearnerIdItemViewModel -> {
-          val profile = viewModel.profile
-          "- Profile name: ${profile.name}, learner ID: ${profile.learnerId}"
-        }
-        else -> null
-      }
-    }.joinToString(separator = "\n")
-    try {
-      activity.startActivity(
-        Intent(Intent.ACTION_SEND).apply {
-          type = "text/plain"
-          addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-          putExtra(Intent.EXTRA_TEXT, sharedText)
-        }
-      )
-    } catch (e: ActivityNotFoundException) {
-      oppiaLogger.e("ProfileAndDeviceIdViewModel", "No activity found to receive shared IDs.", e)
-    }
-  }
-
-  /** Factory for creating new [ShareIdsViewModel]s. */
-  class Factory @Inject constructor(
-    private val oppiaLogger: OppiaLogger,
-    private val activity: AppCompatActivity
-  ) {
-    /** Returns a new [ShareIdsViewModel]. */
-    fun create(viewModels: List<ProfileListItemViewModel>): ShareIdsViewModel =
-      ShareIdsViewModel(oppiaLogger, activity, viewModels)
-  }
-}
diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/SyncStatusItemViewModel.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/SyncStatusItemViewModel.kt
index ced04ad33f3..04cad80889c 100644
--- a/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/SyncStatusItemViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/SyncStatusItemViewModel.kt
@@ -34,19 +34,23 @@ class SyncStatusItemViewModel private constructor(
       is AsyncResult.Pending -> R.string.learner_analytics_sync_status_default
       is AsyncResult.Failure -> {
         oppiaLogger.e(
-          "ProfileAndDeviceIdViewModel", "Failed to retrieve sync status", syncStatusResult.error
+          "SyncStatusItemViewModel", "Failed to retrieve sync status", syncStatusResult.error
         )
         R.string.learner_analytics_sync_status_default
       }
       is AsyncResult.Success -> when (syncStatusResult.value) {
         SyncStatusManager.SyncStatus.INITIAL_UNKNOWN ->
           R.string.learner_analytics_sync_status_default
+        SyncStatusManager.SyncStatus.WAITING_TO_START_UPLOADING ->
+          R.string.learner_analytics_sync_status_waiting_to_upload
         SyncStatusManager.SyncStatus.DATA_UPLOADING ->
           R.string.learner_analytics_sync_status_data_uploading
         SyncStatusManager.SyncStatus.DATA_UPLOADED ->
           R.string.learner_analytics_sync_status_data_uploaded
-        SyncStatusManager.SyncStatus.NETWORK_ERROR, SyncStatusManager.SyncStatus.NO_CONNECTIVITY ->
-          R.string.learner_analytics_sync_status_network_error
+        SyncStatusManager.SyncStatus.UPLOAD_ERROR ->
+          R.string.learner_analytics_sync_status_upload_error
+        SyncStatusManager.SyncStatus.NO_CONNECTIVITY ->
+          R.string.learner_analytics_sync_status_no_internet_connectivity
       }
     }
     return resourceHandler.getStringInLocale(resId)
diff --git a/app/src/main/java/org/oppia/android/app/application/BUILD.bazel b/app/src/main/java/org/oppia/android/app/application/BUILD.bazel
index dee384ea6cc..b91f953bfa1 100644
--- a/app/src/main/java/org/oppia/android/app/application/BUILD.bazel
+++ b/app/src/main/java/org/oppia/android/app/application/BUILD.bazel
@@ -125,7 +125,6 @@ android_library(
         "//utility/src/main/java/org/oppia/android/util/caching:caching_prod_module",
         "//utility/src/main/java/org/oppia/android/util/locale:prod_module",
         "//utility/src/main/java/org/oppia/android/util/logging:prod_module",
-        "//utility/src/main/java/org/oppia/android/util/logging/firebase:prod_module",
         "//utility/src/main/java/org/oppia/android/util/logging/performancemetrics:performance_metrics_assessor_module",
         "//utility/src/main/java/org/oppia/android/util/logging/performancemetrics:performance_metrics_configurations_module",
         "//utility/src/main/java/org/oppia/android/util/networking:debug_util_module",
diff --git a/app/src/main/java/org/oppia/android/app/application/alphakenya/BUILD.bazel b/app/src/main/java/org/oppia/android/app/application/alphakenya/BUILD.bazel
index 538d47308dc..cdc840c6d63 100644
--- a/app/src/main/java/org/oppia/android/app/application/alphakenya/BUILD.bazel
+++ b/app/src/main/java/org/oppia/android/app/application/alphakenya/BUILD.bazel
@@ -21,7 +21,7 @@ kt_android_library(
         "//app/src/main/java/org/oppia/android/app/application:common_application_modules",
         "//app/src/main/java/org/oppia/android/app/application/alpha:alpha_build_flavor_module",
         "//utility/src/main/java/org/oppia/android/util/logging:kenya_alpha_event_logging_configuration_module",
-        "//utility/src/main/java/org/oppia/android/util/logging/firebase:prod_module",
+        "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module",
         "//utility/src/main/java/org/oppia/android/util/networking:prod_module",
     ],
 )
diff --git a/app/src/main/java/org/oppia/android/app/databinding/CircularProgressIndicatorAdapters.java b/app/src/main/java/org/oppia/android/app/databinding/CircularProgressIndicatorAdapters.java
new file mode 100644
index 00000000000..2df902df0f1
--- /dev/null
+++ b/app/src/main/java/org/oppia/android/app/databinding/CircularProgressIndicatorAdapters.java
@@ -0,0 +1,27 @@
+package org.oppia.android.app.databinding;
+
+import androidx.databinding.BindingAdapter;
+import com.google.android.material.progressindicator.CircularProgressIndicator;
+
+/**
+ * Holds all custom binding adapters for setting properties on {@link CircularProgressIndicator}s.
+ */
+public final class CircularProgressIndicatorAdapters {
+  /**
+   * Sets the animated progress for a {@link CircularProgressIndicator}, that is, progress that will
+   * be shown incrementally using an animation.
+   *
+   * <p>Note that progresses of 0 will be ignored. It's recommended to hide the indicator in these
+   * cases, instead.
+   *
+   * @param indicator the {@link CircularProgressIndicator} for which to set progress
+   * @param progress the numerical progress to set on the indicator (which will be displayed based
+   *     on the indicator's customized minimum and maximum progress values)
+   */
+  @BindingAdapter("app:animatedProgress")
+  public static void setAnimatedProgress(CircularProgressIndicator indicator, int progress) {
+    if (progress > 0) {
+      indicator.setProgressCompat(progress, /* animated = */ true);
+    }
+  }
+}
diff --git a/app/src/main/java/org/oppia/android/app/testing/CircularProgressIndicatorAdaptersTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/CircularProgressIndicatorAdaptersTestActivity.kt
new file mode 100644
index 00000000000..11dcf96926f
--- /dev/null
+++ b/app/src/main/java/org/oppia/android/app/testing/CircularProgressIndicatorAdaptersTestActivity.kt
@@ -0,0 +1,40 @@
+package org.oppia.android.app.testing
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.databinding.DataBindingUtil
+import androidx.databinding.ViewDataBinding
+import org.oppia.android.R
+import org.oppia.android.app.activity.ActivityComponentImpl
+import org.oppia.android.app.activity.InjectableAppCompatActivity
+import org.oppia.android.databinding.CircularProgressIndicatorAdaptersTestActivityBinding
+
+/** Test activity for [org.oppia.android.app.databinding.CircularProgressIndicatorAdaptersTest]. */
+class CircularProgressIndicatorAdaptersTestActivity : InjectableAppCompatActivity() {
+  /** View model to use in data-bound circular progress indicators in XML. */
+  val viewModel by lazy { CircularProgressIndicatorAdaptersTestViewModel() }
+
+  /** The [ViewDataBinding] corresponding to this activity's content view layout. */
+  lateinit var binding: ViewDataBinding
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    (activityComponent as ActivityComponentImpl).inject(this)
+    binding = DataBindingUtil.setContentView<CircularProgressIndicatorAdaptersTestActivityBinding>(
+      this, R.layout.circular_progress_indicator_adapters_test_activity
+    ).apply {
+      this.viewModel = this@CircularProgressIndicatorAdaptersTestActivity.viewModel
+      this.lifecycleOwner = this@CircularProgressIndicatorAdaptersTestActivity
+    }
+  }
+
+  companion object {
+    /**
+     * Returns a new [Intent] for the given [Context] to launch new
+     * [CircularProgressIndicatorAdaptersTestActivity]s.
+     */
+    fun createIntent(context: Context): Intent =
+      Intent(context, CircularProgressIndicatorAdaptersTestActivity::class.java)
+  }
+}
diff --git a/app/src/main/java/org/oppia/android/app/testing/CircularProgressIndicatorAdaptersTestViewModel.kt b/app/src/main/java/org/oppia/android/app/testing/CircularProgressIndicatorAdaptersTestViewModel.kt
new file mode 100644
index 00000000000..dc2492a4eb2
--- /dev/null
+++ b/app/src/main/java/org/oppia/android/app/testing/CircularProgressIndicatorAdaptersTestViewModel.kt
@@ -0,0 +1,23 @@
+package org.oppia.android.app.testing
+
+import androidx.lifecycle.MutableLiveData
+import org.oppia.android.app.viewmodel.ObservableViewModel
+
+// TODO(#59): Make this view model only included in relevant tests instead of all prod builds.
+/** [ObservableViewModel] for testing circular progress indicator adapters. */
+class CircularProgressIndicatorAdaptersTestViewModel : ObservableViewModel() {
+  /** The default minimum progress value to bind for circular progress indicators. */
+  val defaultMinimum: Int = 0
+
+  /** The default maximum progress value to bind for circular progress indicators. */
+  val defaultMaximum: Int = 100
+
+  /** The default progress value to bind for circular progress indicators. */
+  val defaultInitialValue: Int = 10
+
+  /**
+   * A [MutableLiveData] that can be used to automatically change the progress of any circular
+   * progress indicators that auto-bind to it for progress tracking.
+   */
+  val currentAutoProgress = MutableLiveData(defaultInitialValue)
+}
diff --git a/app/src/main/res/layout/circular_progress_indicator_adapters_test_activity.xml b/app/src/main/res/layout/circular_progress_indicator_adapters_test_activity.xml
new file mode 100644
index 00000000000..c0f63136ec5
--- /dev/null
+++ b/app/src/main/res/layout/circular_progress_indicator_adapters_test_activity.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?><!-- TODO(#59): Make this layout only accessible to tests. -->
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto">
+
+  <data>
+
+    <variable
+      name="viewModel"
+      type="org.oppia.android.app.testing.CircularProgressIndicatorAdaptersTestViewModel" />
+  </data>
+
+  <LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.google.android.material.progressindicator.CircularProgressIndicator
+      android:id="@+id/circular_progress_indicator_test_bound_view"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:max="@{viewModel.defaultMaximum}"
+      android:min="@{viewModel.defaultMinimum}"
+      app:animatedProgress="@{viewModel.currentAutoProgress}" />
+
+    <com.google.android.material.progressindicator.CircularProgressIndicator
+      android:id="@+id/circular_progress_indicator_test_unbound_view"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:max="@{viewModel.defaultMaximum}"
+      android:min="@{viewModel.defaultMinimum}" />
+  </LinearLayout>
+</layout>
diff --git a/app/src/main/res/layout/profile_list_control_buttons.xml b/app/src/main/res/layout/profile_list_control_buttons.xml
new file mode 100644
index 00000000000..fa3809a5b29
--- /dev/null
+++ b/app/src/main/res/layout/profile_list_control_buttons.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto">
+
+  <data>
+
+    <import type="android.view.View" />
+
+    <variable
+      name="viewModel"
+      type="org.oppia.android.app.administratorcontrols.learneranalytics.ControlButtonsViewModel" />
+  </data>
+
+  <androidx.constraintlayout.widget.ConstraintLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="24dp"
+    android:layout_marginBottom="12dp">
+
+    <Button
+      android:id="@+id/learner_analytics_share_ids_and_events_button"
+      style="@style/SecondaryButton"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_gravity="center"
+      android:minWidth="48dp"
+      android:minHeight="48dp"
+      android:onClick="@{() -> viewModel.onShareButtonClicked()}"
+      android:text="@string/learner_analytics_share_ids_and_events_button_text"
+      app:layout_constraintEnd_toStartOf="@+id/learner_analytics_upload_logs_now_button"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent" />
+
+    <Button
+      android:id="@+id/learner_analytics_upload_logs_now_button"
+      style="@style/SecondaryButton"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_gravity="center"
+      android:enabled="@{viewModel.canStartUploadingLogs(viewModel.forceUploadProgress.isCurrentlyUploading(), viewModel.syncStatus)}"
+      android:minWidth="48dp"
+      android:minHeight="48dp"
+      android:onClick="@{() -> viewModel.onUploadLogsNowButtonClicked()}"
+      android:text="@string/learner_analytics_upload_logs_now_button_text"
+      app:layout_constraintStart_toEndOf="@+id/learner_analytics_share_ids_and_events_button"
+      app:layout_constraintEnd_toStartOf="@+id/learner_analytics_upload_progress_indicator"
+      app:layout_constraintTop_toTopOf="parent" />
+
+    <com.google.android.material.progressindicator.CircularProgressIndicator
+      android:id="@+id/learner_analytics_upload_progress_indicator"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:max="@{viewModel.forceUploadProgress.totalEventsToUpload}"
+      android:min="0"
+      app:animatedProgress="@{viewModel.forceUploadProgress.eventsUploaded}"
+      android:visibility="@{viewModel.forceUploadProgress.hasEventsToUpload() ? View.VISIBLE : View.GONE, default=gone}"
+      app:layout_constraintBottom_toBottomOf="@+id/learner_analytics_upload_logs_now_button"
+      app:layout_constraintStart_toEndOf="@+id/learner_analytics_upload_logs_now_button"
+      app:layout_constraintTop_toTopOf="@+id/learner_analytics_upload_logs_now_button"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:showAnimationBehavior="outward" />
+  </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
diff --git a/app/src/main/res/layout/profile_list_learner_id_item.xml b/app/src/main/res/layout/profile_list_learner_id_item.xml
index caa62e17cb8..619b4b8961f 100644
--- a/app/src/main/res/layout/profile_list_learner_id_item.xml
+++ b/app/src/main/res/layout/profile_list_learner_id_item.xml
@@ -3,6 +3,9 @@
   xmlns:app="http://schemas.android.com/apk/res-auto">
 
   <data>
+
+    <import type="android.view.View" />
+
     <variable
       name="viewModel"
       type="org.oppia.android.app.administratorcontrols.learneranalytics.ProfileLearnerIdItemViewModel" />
@@ -25,11 +28,11 @@
       android:text="@{viewModel.profile.name}"
       android:textColor="@color/component_color_profile_and_device_id_activity_primary_text_color"
       android:textSize="16sp"
+      app:layout_constraintBottom_toBottomOf="@+id/main_learner_id_section_barrier"
+      app:layout_constraintEnd_toStartOf="@+id/profile_id_view_learner_id"
       app:layout_constraintHorizontal_chainStyle="spread_inside"
-      app:layout_constraintTop_toTopOf="parent"
       app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintEnd_toStartOf="@+id/profile_id_view_learner_id"
-      app:layout_constraintBottom_toBottomOf="parent" />
+      app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
       android:id="@+id/profile_id_view_learner_id"
@@ -38,30 +41,173 @@
       android:text="@{viewModel.profile.learnerId}"
       android:textColor="@color/component_color_profile_and_device_id_activity_primary_text_color"
       android:textSize="16sp"
-      app:layout_constraintTop_toTopOf="parent"
-      app:layout_constraintStart_toEndOf="@+id/profile_id_view_profile_name"
+      app:layout_constraintBottom_toBottomOf="@+id/main_learner_id_section_barrier"
       app:layout_constraintEnd_toStartOf="@+id/learner_id_copy_button"
-      app:layout_constraintBottom_toBottomOf="parent" />
+      app:layout_constraintStart_toEndOf="@+id/profile_id_view_profile_name"
+      app:layout_constraintTop_toTopOf="parent" />
 
     <org.oppia.android.app.administratorcontrols.learneranalytics.CopyIdMaterialButtonView
-      style="@style/BorderlessMaterialButton"
       android:id="@+id/learner_id_copy_button"
+      style="@style/BorderlessMaterialButton"
       android:layout_width="0dp"
       android:layout_height="wrap_content"
+      android:enabled="@{!viewModel.profile.learnerId.isEmpty()}"
       android:minWidth="48dp"
       android:minHeight="48dp"
-      android:textColor="@{viewModel.profile.learnerId.isEmpty() ? @color/component_color_profile_and_device_id_activity_disabled_icon_button_color : @color/component_color_profile_and_device_id_activity_enabled_icon_button_color}"
-      android:text="@{viewModel.currentCopiedId == viewModel.profile.learnerId ? @string/learner_analytics_copied_to_clipboard_label : @string/learner_analytics_copy_to_clipboard_label}"
       android:onClick="@{(v) -> viewModel.copyLearnerId()}"
-      android:enabled="@{!viewModel.profile.learnerId.isEmpty()}"
+      android:text="@{viewModel.currentCopiedId == viewModel.profile.learnerId ? @string/learner_analytics_copied_to_clipboard_label : @string/learner_analytics_copy_to_clipboard_label}"
+      android:textColor="@{viewModel.profile.learnerId.isEmpty() ? @color/component_color_profile_and_device_id_activity_disabled_icon_button_color : @color/component_color_profile_and_device_id_activity_enabled_icon_button_color}"
+      app:backgroundTint="@color/color_def_white"
       app:icon="@{viewModel.currentCopiedId == viewModel.profile.learnerId ? @drawable/ic_baseline_check_24 : @drawable/ic_baseline_content_copy_24}"
       app:iconGravity="top"
       app:iconSize="24dp"
       app:iconTint="@{viewModel.profile.learnerId.isEmpty() ? @color/component_color_profile_and_device_id_activity_disabled_icon_button_color : @color/component_color_profile_and_device_id_activity_enabled_icon_button_color}"
-      app:backgroundTint="@color/color_def_white"
-      app:layout_constraintTop_toTopOf="parent"
+      app:layout_constraintBottom_toBottomOf="@+id/main_learner_id_section_barrier"
+      app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toEndOf="@+id/profile_id_view_learner_id"
+      app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.constraintlayout.widget.Barrier
+      android:id="@+id/main_learner_id_section_barrier"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      app:barrierDirection="bottom"
+      app:constraint_referenced_ids="profile_id_view_profile_name,profile_id_view_learner_id,learner_id_copy_button" />
+
+    <View
+      android:id="@+id/main_learner_id_section_barrier_line"
+      android:layout_width="0dp"
+      android:layout_height="1dp"
+      android:layout_marginStart="16dp"
+      android:layout_marginEnd="16dp"
+      android:background="@color/component_color_shared_divider_color"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="@+id/main_learner_id_section_barrier" />
+
+    <TextView
+      android:id="@+id/learner_events_waiting_upload_label"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="16dp"
+      android:layout_marginTop="16dp"
+      android:text="@{viewModel.computeEventsWaitingUploadLabelText()}"
+      android:textColor="@color/component_color_profile_and_device_id_activity_primary_text_color"
+      android:textSize="12sp"
+      app:layout_constraintBottom_toTopOf="@+id/learner_events_awaiting_upload_text_barrier"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@+id/main_learner_id_section_barrier_line" />
+
+    <TextView
+      android:id="@+id/learner_events_waiting_upload_count"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="16dp"
+      android:layout_marginEnd="16dp"
+      android:text="@{viewModel.uploadEventsStats.learnerStats.awaitingUploadEventCountText}"
+      android:textColor="@color/component_color_profile_and_device_id_activity_primary_text_color"
+      android:textSize="12sp"
+      app:layout_constraintBottom_toTopOf="@+id/learner_events_awaiting_upload_text_barrier"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintTop_toBottomOf="@+id/main_learner_id_section_barrier_line" />
+
+    <androidx.constraintlayout.widget.Barrier
+      android:id="@+id/learner_events_awaiting_upload_text_barrier"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      app:barrierDirection="bottom"
+      app:constraint_referenced_ids="learner_events_waiting_upload_label,learner_events_waiting_upload_count" />
+
+    <TextView
+      android:id="@+id/learner_events_uploaded_label"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_margin="16dp"
+      android:text="@{viewModel.computeEventsUploadedLabelText()}"
+      android:textColor="@color/component_color_profile_and_device_id_activity_primary_text_color"
+      android:textSize="12sp"
+      app:layout_constraintBottom_toTopOf="@+id/learner_events_uploaded_text_barrier"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@+id/learner_events_awaiting_upload_text_barrier" />
+
+    <TextView
+      android:id="@+id/learner_events_uploaded_count"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_margin="16dp"
+      android:text="@{viewModel.uploadEventsStats.learnerStats.uploadedEventCountText}"
+      android:textColor="@color/component_color_profile_and_device_id_activity_primary_text_color"
+      android:textSize="12sp"
+      app:layout_constraintBottom_toTopOf="@+id/learner_events_uploaded_text_barrier"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintTop_toBottomOf="@+id/learner_events_awaiting_upload_text_barrier" />
+
+    <androidx.constraintlayout.widget.Barrier
+      android:id="@+id/learner_events_uploaded_text_barrier"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      app:barrierDirection="bottom"
+      app:constraint_referenced_ids="learner_events_uploaded_label,learner_events_uploaded_count" />
+
+    <TextView
+      android:id="@+id/uncategorized_events_waiting_upload_label"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="16dp"
+      android:layout_marginTop="16dp"
+      android:text="@string/learner_analytics_uncategorized_events_waiting_upload"
+      android:textColor="@color/component_color_profile_and_device_id_activity_primary_text_color"
+      android:textSize="12sp"
+      android:visibility="@{viewModel.uploadEventsStats.hasUncategorizedStats() ? View.VISIBLE : View.GONE, default=gone}"
+      app:layout_constraintBottom_toTopOf="@+id/uncategorized_events_awaiting_upload_text_barrier"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@+id/learner_events_uploaded_text_barrier" />
+
+    <TextView
+      android:id="@+id/uncategorized_events_waiting_upload_count"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="16dp"
+      android:layout_marginEnd="16dp"
+      android:text="@{viewModel.uploadEventsStats.uncategorizedStats.awaitingUploadEventCountText}"
+      android:textColor="@color/component_color_profile_and_device_id_activity_primary_text_color"
+      android:textSize="12sp"
+      android:visibility="@{viewModel.uploadEventsStats.hasUncategorizedStats() ? View.VISIBLE : View.GONE, default=gone}"
+      app:layout_constraintBottom_toTopOf="@+id/uncategorized_events_awaiting_upload_text_barrier"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintTop_toBottomOf="@+id/learner_events_uploaded_text_barrier" />
+
+    <androidx.constraintlayout.widget.Barrier
+      android:id="@+id/uncategorized_events_awaiting_upload_text_barrier"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      app:barrierDirection="bottom"
+      app:constraint_referenced_ids="learner_events_waiting_upload_label,learner_events_waiting_upload_count" />
+
+    <TextView
+      android:id="@+id/uncategorized_events_uploaded_label"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_margin="16dp"
+      android:text="@string/learner_analytics_uncategorized_events_uploaded"
+      android:textColor="@color/component_color_profile_and_device_id_activity_primary_text_color"
+      android:textSize="12sp"
+      android:visibility="@{viewModel.uploadEventsStats.hasUncategorizedStats() ? View.VISIBLE : View.GONE, default=gone}"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@+id/uncategorized_events_awaiting_upload_text_barrier" />
+
+    <TextView
+      android:id="@+id/uncategorized_events_uploaded_count"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_margin="16dp"
+      android:text="@{viewModel.uploadEventsStats.uncategorizedStats.uploadedEventCountText}"
+      android:textColor="@color/component_color_profile_and_device_id_activity_primary_text_color"
+      android:textSize="12sp"
+      android:visibility="@{viewModel.uploadEventsStats.hasUncategorizedStats() ? View.VISIBLE : View.GONE, default=gone}"
+      app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintBottom_toBottomOf="parent" />
+      app:layout_constraintTop_toBottomOf="@+id/uncategorized_events_awaiting_upload_text_barrier" />
   </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/layout/profile_list_share_ids_item.xml b/app/src/main/res/layout/profile_list_share_ids_item.xml
deleted file mode 100644
index 709f9fda1d7..00000000000
--- a/app/src/main/res/layout/profile_list_share_ids_item.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <data>
-
-    <variable
-      name="viewModel"
-      type="org.oppia.android.app.administratorcontrols.learneranalytics.ShareIdsViewModel" />
-  </data>
-
-  <FrameLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="24dp"
-    android:layout_marginBottom="12dp">
-
-    <Button
-      style="@style/SecondaryButton"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_gravity="center"
-      android:minWidth="48dp"
-      android:minHeight="48dp"
-      android:onClick="@{() -> viewModel.onShareIdsButtonClicked()}"
-      android:text="@string/learner_analytics_share_ids_button_text" />
-  </FrameLayout>
-</layout>
diff --git a/app/src/main/res/values/untranslated_strings.xml b/app/src/main/res/values/untranslated_strings.xml
index 5f28fd0cc41..0ba71a6f072 100644
--- a/app/src/main/res/values/untranslated_strings.xml
+++ b/app/src/main/res/values/untranslated_strings.xml
@@ -78,12 +78,20 @@
   <string name="learner_analytics_copied_to_clipboard_label" translatable="false">Copied</string>
   <!-- Learner Analytics Sync Statuses -->
   <string name="learner_analytics_sync_status_default" translatable="false">No data has been collected yet to upload.</string>
+  <string name="learner_analytics_sync_status_waiting_to_upload" translatable="false">Waiting to schedule data uploading worker…</string>
   <string name="learner_analytics_sync_status_data_uploading" translatable="false">Profile data is currently uploading…</string>
   <string name="learner_analytics_sync_status_data_uploaded" translatable="false">All profile data has been uploaded.</string>
-  <string name="learner_analytics_sync_status_network_error" translatable="false">Please connect to a WiFi or Cellular network in order to upload profile data.</string>
+  <string name="learner_analytics_sync_status_upload_error" translatable="false">Something went wrong when trying to upload events.</string>
+  <string name="learner_analytics_sync_status_no_internet_connectivity" translatable="false">Please connect to a WiFi or Cellular network in order to upload profile data.</string>
   <string name="learner_analytics_device_id_clipboard_label_description" translatable="false">%s installation ID</string>
   <string name="learner_analytics_learner_id_clipboard_label_description" translatable="false">%s\'s learner ID</string>
-  <string name="learner_analytics_share_ids_button_text" translatable="false">Share IDs</string>
+  <string name="learner_analytics_share_ids_and_events_button_text" translatable="false">Share IDs &amp; Logs</string>
+  <string name="learner_analytics_upload_logs_now_button_text" translatable="false">Upload Logs</string>
+  <string name="learner_analytics_learner_events_waiting_upload" translatable="false">Number of \'%s\' events awaiting upload:</string>
+  <string name="learner_analytics_learner_events_uploaded" translatable="false">Number of \'%s\' events uploaded:</string>
+  <string name="learner_analytics_uncategorized_events_waiting_upload" translatable="false">Number of uncategorized events awaiting upload:</string>
+  <string name="learner_analytics_uncategorized_events_uploaded" translatable="false">Number of uncategorized events uploaded:</string>
+  <string name="learner_analytics_unknown_event_count" translatable="false">Unknown</string>
   <!-- Temporary learner strings. -->
   <string name="temporary_translate_to_swahili" translatable="false">Badilisha lugha hadi Kiswahili</string>
   <string name="temporary_translate_to_english" translatable="false">Switch lesson to English</string>
diff --git a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/BUILD.bazel b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/BUILD.bazel
index b9345fe116f..f98a384b911 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/BUILD.bazel
+++ b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/BUILD.bazel
@@ -51,10 +51,12 @@ app_test(
         "//app/src/main/java/org/oppia/android/app/translation/testing:test_module",
         "//testing",
         "//testing/src/main/java/org/oppia/android/testing/junit:initialize_default_locale_rule",
+        "//testing/src/main/java/org/oppia/android/testing/logging:sync_status_test_module",
         "//testing/src/main/java/org/oppia/android/testing/platformparameter:test_module",
         "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module",
         "//testing/src/main/java/org/oppia/android/testing/threading:test_module",
         "//testing/src/main/java/org/oppia/android/testing/time:test_module",
+        "//third_party:androidx_test_ext_truth",
         "//third_party:androidx_work_work-testing",
         "//third_party:com_google_truth_truth",
         "//third_party:junit_junit",
diff --git a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdFragmentTest.kt
index 0c0fb6d6c25..52043072958 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdFragmentTest.kt
@@ -11,21 +11,21 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.RecyclerView
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.ViewInteraction
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.action.ViewActions.scrollTo
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition
 import androidx.test.espresso.intent.Intents
-import androidx.test.espresso.intent.Intents.intended
-import androidx.test.espresso.intent.matcher.IntentMatchers.hasAction
-import androidx.test.espresso.intent.matcher.IntentMatchers.hasExtra
-import androidx.test.espresso.intent.matcher.IntentMatchers.hasType
+import androidx.test.espresso.intent.Intents.getIntents
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.isEnabled
 import androidx.test.espresso.matcher.ViewMatchers.isRoot
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.ext.truth.content.IntentSubject.assertThat
 import androidx.work.Configuration
 import androidx.work.Data
 import androidx.work.OneTimeWorkRequestBuilder
@@ -37,6 +37,7 @@ import dagger.Component
 import dagger.Module
 import dagger.Provides
 import org.hamcrest.CoreMatchers.containsString
+import org.hamcrest.CoreMatchers.not
 import org.hamcrest.Matcher
 import org.junit.After
 import org.junit.Before
@@ -55,6 +56,7 @@ import org.oppia.android.app.application.ApplicationStartupListenerModule
 import org.oppia.android.app.application.testing.TestingBuildFlavorModule
 import org.oppia.android.app.devoptions.DeveloperOptionsModule
 import org.oppia.android.app.devoptions.DeveloperOptionsStarterModule
+import org.oppia.android.app.model.ProfileId
 import org.oppia.android.app.player.state.itemviewmodel.SplitScreenInteractionModule
 import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView
 import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.hasItemCount
@@ -96,14 +98,18 @@ import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModu
 import org.oppia.android.domain.question.QuestionModule
 import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule
 import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule
+import org.oppia.android.testing.FakeAnalyticsEventLogger
 import org.oppia.android.testing.OppiaTestRule
 import org.oppia.android.testing.TestLogReportingModule
 import org.oppia.android.testing.junit.InitializeDefaultLocaleRule
+import org.oppia.android.testing.logging.SyncStatusTestModule
+import org.oppia.android.testing.logging.TestSyncStatusManager
 import org.oppia.android.testing.platformparameter.TestPlatformParameterModule
 import org.oppia.android.testing.profile.ProfileTestHelper
 import org.oppia.android.testing.robolectric.RobolectricModule
 import org.oppia.android.testing.threading.TestCoroutineDispatchers
 import org.oppia.android.testing.threading.TestDispatcherModule
+import org.oppia.android.testing.time.FakeOppiaClock
 import org.oppia.android.testing.time.FakeOppiaClockModule
 import org.oppia.android.util.accessibility.AccessibilityTestModule
 import org.oppia.android.util.caching.AssetModule
@@ -112,16 +118,15 @@ import org.oppia.android.util.gcsresource.GcsResourceModule
 import org.oppia.android.util.locale.LocaleProdModule
 import org.oppia.android.util.logging.EventLoggingConfigurationModule
 import org.oppia.android.util.logging.LoggerModule
-import org.oppia.android.util.logging.SyncStatusManager
-import org.oppia.android.util.logging.SyncStatusModule
+import org.oppia.android.util.logging.SyncStatusManager.SyncStatus
 import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule
 import org.oppia.android.util.networking.NetworkConnectionDebugUtil
 import org.oppia.android.util.networking.NetworkConnectionDebugUtilModule
+import org.oppia.android.util.networking.NetworkConnectionUtil.ProdConnectionStatus
 import org.oppia.android.util.networking.NetworkConnectionUtilDebugModule
 import org.oppia.android.util.parser.html.HtmlParserEntityTypeModule
 import org.oppia.android.util.parser.image.GlideImageLoaderModule
 import org.oppia.android.util.parser.image.ImageParsingModule
-import org.oppia.android.util.system.OppiaClock
 import org.robolectric.annotation.Config
 import org.robolectric.annotation.LooperMode
 import java.util.concurrent.TimeUnit
@@ -139,10 +144,6 @@ import javax.inject.Singleton
   qualifiers = "port-xxhdpi"
 )
 class ProfileAndDeviceIdFragmentTest {
-  private companion object {
-    private const val DEFAULT_APPLICATION_ID = 123456789L
-  }
-
   @get:Rule val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
   @get:Rule val oppiaTestRule = OppiaTestRule()
   @get:Rule
@@ -155,11 +156,12 @@ class ProfileAndDeviceIdFragmentTest {
   @Inject lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
   @Inject lateinit var context: Context
   @Inject lateinit var oppiaLogger: OppiaLogger
-  @Inject lateinit var oppiaClock: OppiaClock
+  @Inject lateinit var fakeOppiaClock: FakeOppiaClock
   @Inject lateinit var networkConnectionUtil: NetworkConnectionDebugUtil
   @Inject lateinit var logUploadWorkerFactory: LogUploadWorkerFactory
-  @Inject lateinit var syncStatusManager: SyncStatusManager
+  @Inject lateinit var syncStatusManager: TestSyncStatusManager
   @Inject lateinit var learnerAnalyticsLogger: LearnerAnalyticsLogger
+  @Inject lateinit var fakeAnalyticsEventLogger: FakeAnalyticsEventLogger
 
   private val clipboardManager by lazy {
     context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
@@ -199,28 +201,28 @@ class ProfileAndDeviceIdFragmentTest {
   fun testFragment_withOnlyAdminProfile_hasDeviceIdHeader() {
     initializeActivityAndAddFragment()
 
-    onView(deviceIdLabelAt(position = 0)).check(matches(isDisplayed()))
+    onDeviceIdLabelAt(position = 0).check(matches(isDisplayed()))
   }
 
   @Test
   fun testFragment_hasDeviceId() {
     initializeActivityAndAddFragment()
 
-    onView(deviceIdLabelAt(position = 0)).check(matches(withText(containsString("c85606ca6390"))))
+    onDeviceIdLabelAt(position = 0).check(matches(withText(containsString("c85606ca6390"))))
   }
 
   @Test
   fun testFragment_deviceId_hasCopyButton() {
     initializeActivityAndAddFragment()
 
-    onView(deviceIdCopyButtonAt(position = 0)).check(matches(isDisplayed()))
+    onDeviceIdCopyButtonAt(position = 0).check(matches(isDisplayed()))
   }
 
   @Test
   fun testFragment_deviceId_clickCopyButton_copiesDeviceIdToClipboard() {
     initializeActivityAndAddFragment()
 
-    onView(deviceIdCopyButtonAt(position = 0)).perform(click())
+    onDeviceIdCopyButtonAt(position = 0).perform(click())
     testCoroutineDispatchers.runCurrent()
 
     val clipData = getCurrentClipData()
@@ -233,35 +235,35 @@ class ProfileAndDeviceIdFragmentTest {
   fun testFragment_withOnlyAdminProfile_hasOneProfileListed() {
     initializeActivityAndAddFragment()
 
-    onView(profileNameAt(position = 1)).check(matches(isDisplayed()))
+    onProfileNameAt(position = 1).check(matches(isDisplayed()))
   }
 
   @Test
   fun testFragment_profileEntry_hasProfileName() {
     initializeActivityAndAddFragment()
 
-    onView(profileNameAt(position = 1)).check(matches(withText("Admin")))
+    onProfileNameAt(position = 1).check(matches(withText("Admin")))
   }
 
   @Test
   fun testFragment_profileEntry_hasLearnerId() {
     initializeActivityAndAddFragment()
 
-    onView(learnerIdAt(position = 1)).check(matches(withText("a9fe66ab")))
+    onLearnerIdAt(position = 1).check(matches(withText("a9fe66ab")))
   }
 
   @Test
   fun testFragment_profileEntry_hasCopyButton() {
     initializeActivityAndAddFragment()
 
-    onView(learnerIdCopyButtonAt(position = 1)).check(matches(isDisplayed()))
+    onLearnerIdCopyButtonAt(position = 1).check(matches(isDisplayed()))
   }
 
   @Test
   fun testFragment_profileEntry_clickFirstCopyButton_copiesAdminLearnerIdToClipboard() {
     initializeActivityAndAddFragment()
 
-    onView(learnerIdCopyButtonAt(position = 1)).perform(click())
+    onLearnerIdCopyButtonAt(position = 1).perform(click())
     testCoroutineDispatchers.runCurrent()
 
     val clipData = getCurrentClipData()
@@ -286,7 +288,7 @@ class ProfileAndDeviceIdFragmentTest {
 
     initializeActivityAndAddFragment()
 
-    onView(profileNameAt(position = 1)).check(matches(withText("Admin")))
+    onProfileNameAt(position = 1).check(matches(withText("Admin")))
   }
 
   @Test
@@ -296,7 +298,7 @@ class ProfileAndDeviceIdFragmentTest {
     initializeActivityAndAddFragment()
 
     // The second entry is not the admin.
-    onView(profileNameAt(position = 2)).check(matches(withText("A")))
+    onProfileNameAt(position = 2).check(matches(withText("A")))
   }
 
   @Test
@@ -306,8 +308,8 @@ class ProfileAndDeviceIdFragmentTest {
     initializeActivityAndAddFragment()
 
     // The second profile has a different learner ID.
-    onView(learnerIdAt(position = 1)).check(matches(withText("a9fe66ab")))
-    onView(learnerIdAt(position = 2)).check(matches(withText("c368b501")))
+    onLearnerIdAt(position = 1).check(matches(withText("a9fe66ab")))
+    onLearnerIdAt(position = 2).check(matches(withText("c368b501")))
   }
 
   @Test
@@ -316,7 +318,7 @@ class ProfileAndDeviceIdFragmentTest {
 
     initializeActivityAndAddFragment()
 
-    onView(learnerIdCopyButtonAt(position = 2)).perform(click())
+    onLearnerIdCopyButtonAt(position = 2).perform(click())
     testCoroutineDispatchers.runCurrent()
 
     val clipData = getCurrentClipData()
@@ -329,63 +331,63 @@ class ProfileAndDeviceIdFragmentTest {
   fun testFragment_initialState_deviceIdCopyButtonHasCopyLabel() {
     initializeActivityAndAddFragment()
 
-    onView(deviceIdCopyButtonAt(position = 0)).check(matches(withText("Copy")))
+    onDeviceIdCopyButtonAt(position = 0).check(matches(withText("Copy")))
   }
 
   @Test
   fun testFragment_adminProfile_initialState_learnerIdCopyButtonHasCopyLabel() {
     initializeActivityAndAddFragment()
 
-    onView(learnerIdCopyButtonAt(position = 1)).check(matches(withText("Copy")))
+    onLearnerIdCopyButtonAt(position = 1).check(matches(withText("Copy")))
   }
 
   @Test
   fun testFragment_adminProfile_clickDeviceIdCopyButton_deviceIdIsCopiedButNotLearnerId() {
     initializeActivityAndAddFragment()
 
-    onView(deviceIdCopyButtonAt(position = 0)).perform(click())
+    onDeviceIdCopyButtonAt(position = 0).perform(click())
     testCoroutineDispatchers.runCurrent()
 
-    onView(deviceIdCopyButtonAt(position = 0)).check(matches(withText("Copied")))
-    onView(learnerIdCopyButtonAt(position = 1)).check(matches(withText("Copy")))
+    onDeviceIdCopyButtonAt(position = 0).check(matches(withText("Copied")))
+    onLearnerIdCopyButtonAt(position = 1).check(matches(withText("Copy")))
   }
 
   @Test
   fun testFragment_adminProfile_clickLearnerIdCopyButton_learnerIdIsCopiedButNotDeviceId() {
     initializeActivityAndAddFragment()
 
-    onView(learnerIdCopyButtonAt(position = 1)).perform(click())
+    onLearnerIdCopyButtonAt(position = 1).perform(click())
     testCoroutineDispatchers.runCurrent()
 
-    onView(deviceIdCopyButtonAt(position = 0)).check(matches(withText("Copy")))
-    onView(learnerIdCopyButtonAt(position = 1)).check(matches(withText("Copied")))
+    onDeviceIdCopyButtonAt(position = 0).check(matches(withText("Copy")))
+    onLearnerIdCopyButtonAt(position = 1).check(matches(withText("Copied")))
   }
 
   @Test
   fun testFragment_adminProfile_clickLearnerIdCopyButton_copyInOtherApp_nothingIsCopied() {
     initializeActivityAndAddFragment()
-    onView(learnerIdCopyButtonAt(position = 1)).perform(click())
+    onLearnerIdCopyButtonAt(position = 1).perform(click())
     testCoroutineDispatchers.runCurrent()
 
     updateClipDataAsThoughFromAnotherApp()
 
     // Changing the clipboard in a different app should reset the labels.
-    onView(deviceIdCopyButtonAt(position = 0)).check(matches(withText("Copy")))
-    onView(learnerIdCopyButtonAt(position = 1)).check(matches(withText("Copy")))
+    onDeviceIdCopyButtonAt(position = 0).check(matches(withText("Copy")))
+    onLearnerIdCopyButtonAt(position = 1).check(matches(withText("Copy")))
   }
 
   @Test
   fun testFragment_adminProfile_clickLearnerIdCopyButton_rotate_learnerIdStillCopied() {
     initializeActivityAndAddFragment()
-    onView(learnerIdCopyButtonAt(position = 1)).perform(click())
+    onLearnerIdCopyButtonAt(position = 1).perform(click())
     testCoroutineDispatchers.runCurrent()
 
     onView(isRoot()).perform(orientationLandscape())
     testCoroutineDispatchers.runCurrent()
 
     // The button label should be restored after a rotation.
-    onView(deviceIdCopyButtonAt(position = 0)).check(matches(withText("Copy")))
-    onView(learnerIdCopyButtonAt(position = 1)).check(matches(withText("Copied")))
+    onDeviceIdCopyButtonAt(position = 0).check(matches(withText("Copy")))
+    onLearnerIdCopyButtonAt(position = 1).check(matches(withText("Copied")))
   }
 
   @Test
@@ -399,11 +401,183 @@ class ProfileAndDeviceIdFragmentTest {
     onView(withId(R.id.profile_and_device_id_recycler_view)).check(hasItemCount(count = 9))
   }
 
+  @Test
+  fun testFragment_firstEntry_noAdminEvents_hasZeroAdminEventsReported() {
+    profileTestHelper.addMoreProfiles(numProfiles = 1)
+    initializeActivityAndAddFragment()
+
+    onAwaitingUploadLearnerEventsCountAt(position = 1).check(matches(withText("0")))
+    onUploadedLearnerEventsCountAt(position = 1).check(matches(withText("0")))
+  }
+
+  @Test
+  fun testFragment_firstEntry_adminEvents_notUploaded_hasSomeAdminEventsReported() {
+    profileTestHelper.addMoreProfiles(numProfiles = 1)
+    initializeActivityAndAddFragment()
+    disconnectNetwork() // Ensure events are cached.
+
+    // Log a couple of events.
+    logTwoAnalyticsEvents(profileId = ADMIN_PROFILE_ID)
+
+    // Two are awaiting upload, but neither have been uploaded yet.
+    onAwaitingUploadLearnerEventsCountAt(position = 1).check(matches(withText("2")))
+    onUploadedLearnerEventsCountAt(position = 1).check(matches(withText("0")))
+  }
+
+  @Test
+  fun testFragment_firstEntry_adminEvents_uploaded_hasSomeAdminEventsReported() {
+    profileTestHelper.addMoreProfiles(numProfiles = 1)
+    initializeActivityAndAddFragment()
+    disconnectNetwork() // Ensure events are cached.
+
+    // Log a couple of events, upload them, then log one more event.
+    logTwoAnalyticsEvents(profileId = ADMIN_PROFILE_ID)
+    connectOnlyToFlushWorkerQueue()
+    logAnalyticsEvent(profileId = ADMIN_PROFILE_ID)
+
+    // Two should be uploaded, and one waiting upload.
+    onAwaitingUploadLearnerEventsCountAt(position = 1).check(matches(withText("1")))
+    onUploadedLearnerEventsCountAt(position = 1).check(matches(withText("2")))
+  }
+
+  @Test
+  fun testFragment_firstEntry_noGenericEvents_hasZeroGenericEventsReported() {
+    profileTestHelper.addMoreProfiles(numProfiles = 1)
+    initializeActivityAndAddFragment()
+
+    onAwaitingUploadUncategorizedEventsCountAt(position = 1).check(matches(withText("0")))
+    onUploadedUncategorizedEventsCountAt(position = 1).check(matches(withText("0")))
+  }
+
+  @Test
+  fun testFragment_firstEntry_genericEvents_notUploaded_hasSomeGenericEventsReported() {
+    profileTestHelper.addMoreProfiles(numProfiles = 1)
+    initializeActivityAndAddFragment()
+    disconnectNetwork() // Ensure events are cached.
+
+    // Log a couple of events off of the admin profile.
+    logTwoAnalyticsEvents(profileId = null)
+
+    onAwaitingUploadUncategorizedEventsCountAt(position = 1).check(matches(withText("2")))
+    onUploadedUncategorizedEventsCountAt(position = 1).check(matches(withText("0")))
+  }
+
+  @Test
+  fun testFragment_firstEntry_genericEvents_uploaded_hasSomeGenericEventsReported() {
+    profileTestHelper.addMoreProfiles(numProfiles = 1)
+    initializeActivityAndAddFragment()
+    disconnectNetwork() // Ensure events are cached.
+
+    // Log a couple of events, upload them, then log one more event, off of the admin profile.
+    logTwoAnalyticsEvents(profileId = null)
+    connectOnlyToFlushWorkerQueue()
+    logAnalyticsEvent(profileId = null)
+
+    onAwaitingUploadUncategorizedEventsCountAt(position = 1).check(matches(withText("1")))
+    onUploadedUncategorizedEventsCountAt(position = 1).check(matches(withText("2")))
+  }
+
+  @Test
+  fun testFragment_firstEntry_mixOfAdminAndGenericEvents_someUploaded_reportsAllEvents() {
+    profileTestHelper.addMoreProfiles(numProfiles = 1)
+    initializeActivityAndAddFragment()
+    disconnectNetwork() // Ensure events are cached.
+
+    // Log & upload a mix of events with and without the admin profile.
+    logAnalyticsEvent(profileId = ADMIN_PROFILE_ID)
+    logThreeAnalyticsEvents(profileId = null)
+    connectOnlyToFlushWorkerQueue()
+    logAnalyticsEvent(profileId = null)
+    logTwoAnalyticsEvents(profileId = ADMIN_PROFILE_ID)
+
+    // Event counts should be represented in the correct places.
+    onAwaitingUploadLearnerEventsCountAt(position = 1).check(matches(withText("2")))
+    onUploadedLearnerEventsCountAt(position = 1).check(matches(withText("1")))
+    onAwaitingUploadUncategorizedEventsCountAt(position = 1).check(matches(withText("1")))
+    onUploadedUncategorizedEventsCountAt(position = 1).check(matches(withText("3")))
+  }
+
+  @Test
+  fun testFragment_secondEntry_noLearnerEvents_hasZeroLearnerEventsReported() {
+    profileTestHelper.addMoreProfiles(numProfiles = 1)
+    initializeActivityAndAddFragment()
+
+    onAwaitingUploadLearnerEventsCountAt(position = 2).check(matches(withText("0")))
+    onUploadedLearnerEventsCountAt(position = 2).check(matches(withText("0")))
+  }
+
+  @Test
+  fun testFragment_secondEntry_learnerEvents_notUploaded_hasSomeLearnerEventsReported() {
+    profileTestHelper.addMoreProfiles(numProfiles = 1)
+    initializeActivityAndAddFragment()
+    disconnectNetwork() // Ensure events are cached.
+
+    // Log a couple of events.
+    logTwoAnalyticsEvents(profileId = LEARNER_PROFILE_ID_0)
+
+    // Two are awaiting upload, but neither have been uploaded yet.
+    onAwaitingUploadLearnerEventsCountAt(position = 2).check(matches(withText("2")))
+    onUploadedLearnerEventsCountAt(position = 2).check(matches(withText("0")))
+  }
+
+  @Test
+  fun testFragment_secondEntry_learnerEvents_uploaded_hasSomeLearnerEventsReported() {
+    profileTestHelper.addMoreProfiles(numProfiles = 1)
+    initializeActivityAndAddFragment()
+    disconnectNetwork() // Ensure events are cached.
+
+    // Log a couple of events, upload them, then log one more event.
+    logTwoAnalyticsEvents(profileId = LEARNER_PROFILE_ID_0)
+    connectOnlyToFlushWorkerQueue()
+    logAnalyticsEvent(profileId = LEARNER_PROFILE_ID_0)
+
+    // Two should be uploaded, and one waiting upload.
+    onAwaitingUploadLearnerEventsCountAt(position = 2).check(matches(withText("1")))
+    onUploadedLearnerEventsCountAt(position = 2).check(matches(withText("2")))
+  }
+
+  @Test
+  fun testFragment_secondEntry_learnerEvents_hasZeroAdminOrGenericEventsReported() {
+    profileTestHelper.addMoreProfiles(numProfiles = 1)
+    initializeActivityAndAddFragment()
+    disconnectNetwork() // Ensure events are cached.
+
+    // Log a couple of events, upload them, then log one more event, for a learner profile.
+    logTwoAnalyticsEvents(profileId = LEARNER_PROFILE_ID_0)
+    connectOnlyToFlushWorkerQueue()
+    logAnalyticsEvent(profileId = LEARNER_PROFILE_ID_0)
+
+    // The admin profile's event counts shouldn't change since the only logged events were for a
+    // specific learner profile.
+    onAwaitingUploadLearnerEventsCountAt(position = 1).check(matches(withText("0")))
+    onUploadedLearnerEventsCountAt(position = 1).check(matches(withText("0")))
+    onAwaitingUploadUncategorizedEventsCountAt(position = 1).check(matches(withText("0")))
+    onUploadedUncategorizedEventsCountAt(position = 1).check(matches(withText("0")))
+  }
+
+  @Test
+  fun testFragment_secondEntry_adminAndGenericEvents_uploaded_hasZeroLearnerEventsReported() {
+    profileTestHelper.addMoreProfiles(numProfiles = 1)
+    initializeActivityAndAddFragment()
+    disconnectNetwork() // Ensure events are cached.
+
+    // Log a couple of events generically and for the admin profile.
+    logAnalyticsEvent(profileId = ADMIN_PROFILE_ID)
+    logAnalyticsEvent(profileId = null)
+    connectOnlyToFlushWorkerQueue()
+    logAnalyticsEvent(profileId = ADMIN_PROFILE_ID)
+    logAnalyticsEvent(profileId = null)
+
+    // No events should be reported for the learner since it didn't have any events uploaded.
+    onAwaitingUploadLearnerEventsCountAt(position = 2).check(matches(withText("0")))
+    onUploadedLearnerEventsCountAt(position = 2).check(matches(withText("0")))
+  }
+
   @Test
   fun testFragment_initialState_profileDataHasYetToBeCollected() {
     initializeActivityAndAddFragment()
 
-    onView(syncStatusAt(position = 2))
+    onSyncStatusAt(position = 2)
       .check(matches(withText(containsString("No data has been collected yet to upload"))))
   }
 
@@ -413,66 +587,106 @@ class ProfileAndDeviceIdFragmentTest {
 
     testCoroutineDispatchers.advanceTimeBy(delayTimeMillis = TimeUnit.SECONDS.toMillis(1))
 
-    onView(syncStatusAt(position = 2))
+    onSyncStatusAt(position = 2)
       .check(matches(withText(containsString("No data has been collected yet to upload"))))
   }
 
   @Test
-  fun testFragment_eventLogged_waitingForUpload_profileDataIsCurrentlyUploading() {
+  fun testFragment_eventLogged_waitingForUpload_indicatorTextMentionsWaiting() {
+    initializeActivityAndAddFragment()
+    disconnectNetwork() // Ensure events are cached.
+
+    // Enqueue the event, but don't actually begin uploading it, then reconnect to the network. Note
+    // that the extra event log is a slight hack to force a refresh of the status indicator (since
+    // network changes are polled when there are other changes to represent rather than being
+    // actively "pushed" by the system).
+    logAnalyticsEvent()
+    connectNetwork()
+    logAnalyticsEvent()
+
+    // The status indicator is suggesting that events can be uploaded (and there are some available
+    // to upload), they just haven't been scheduled yet.
+    onSyncStatusAt(position = 2)
+      .check(matches(withText(containsString("Waiting to schedule data uploading worker…"))))
+  }
+
+  @Test
+  fun testFragment_eventLogged_waitingForUpload_uploadStarted_profileDataIsCurrentlyUploading() {
     initializeActivityAndAddFragment()
+    disconnectNetwork() // Ensure events are cached.
 
     // Unfortunately, it's tricky to pause the actual upload worker so this is a hacky way to
     // produce the same situation to ensure the label is correct.
-    queueAnalyticsEvent()
-    syncStatusManager.setSyncStatus(SyncStatusManager.SyncStatus.DATA_UPLOADING)
+    logAnalyticsEvent()
+    syncStatusManager.forceSyncStatus(SyncStatus.DATA_UPLOADING)
     testCoroutineDispatchers.runCurrent()
 
-    onView(syncStatusAt(position = 2))
+    onSyncStatusAt(position = 2)
       .check(matches(withText(containsString("Profile data is currently uploading"))))
   }
 
+  @Test
+  fun testFragment_noConnectivity_indicatorTextMentionsDataCannotBeUploaded() {
+    initializeActivityAndAddFragment()
+    disconnectNetwork() // Ensure events are cached.
+
+    // Enqueue an event but don't reconnect to the network.
+    logAnalyticsEvent()
+
+    // The status indicator is suggesting that internet connectivity needs to resume in order to
+    // upload events.
+    onSyncStatusAt(position = 2)
+      .check(
+        matches(
+          withText(
+            containsString(
+              "Please connect to a WiFi or Cellular network in order to upload profile data"
+            )
+          )
+        )
+      )
+  }
+
   @Test
   fun testFragment_eventLogged_waitForUpload_profileDataIsUploaded() {
     initializeActivityAndAddFragment()
+    disconnectNetwork() // Ensure events are cached.
 
-    queueAnalyticsEvent()
+    logAnalyticsEvent()
+    connectNetwork()
     flushEventWorkerQueue()
 
-    onView(syncStatusAt(position = 2))
+    onSyncStatusAt(position = 2)
       .check(matches(withText(containsString("All profile data has been uploaded"))))
   }
 
   @Test
-  fun testFragment_eventLogged_networkError_profileDataHasError() {
+  fun testFragment_eventLogged_uploadError_profileDataHasError() {
     initializeActivityAndAddFragment()
-    queueAnalyticsEvent()
+    disconnectNetwork() // Ensure events are cached.
+    logAnalyticsEvent()
 
-    // A network error can currently only be simulated by directly influencing the sync manager.
-    syncStatusManager.setSyncStatus(SyncStatusManager.SyncStatus.NETWORK_ERROR)
+    // An upload error can currently only be simulated by directly influencing the sync manager.
+    syncStatusManager.forceSyncStatus(SyncStatus.UPLOAD_ERROR)
     testCoroutineDispatchers.runCurrent()
 
-    onView(syncStatusAt(position = 2))
-      .check(
-        matches(
-          withText(
-            containsString(
-              "Please connect to a WiFi or Cellular network in order to upload profile data"
-            )
-          )
-        )
-      )
+    onSyncStatusAt(position = 2)
+      .check(matches(withText(containsString("Something went wrong when trying to upload events"))))
   }
 
   @Test
-  fun testFragment_eventLogged_networkError_anotherLogged_wait_profileDataIsUploading() {
+  fun testFragment_eventLogged_uploadError_anotherLogged_wait_profileDataIsUploading() {
     initializeActivityAndAddFragment()
-    queueAnalyticsEvent()
-    syncStatusManager.setSyncStatus(SyncStatusManager.SyncStatus.NETWORK_ERROR)
+    disconnectNetwork() // Ensure events are cached.
+    logAnalyticsEvent()
+    syncStatusManager.reportUploadError()
+    testCoroutineDispatchers.runCurrent()
 
-    queueAnalyticsEvent()
+    logAnalyticsEvent()
+    connectNetwork()
     flushEventWorkerQueue()
 
-    onView(syncStatusAt(position = 2))
+    onSyncStatusAt(position = 2)
       .check(matches(withText(containsString("All profile data has been uploaded"))))
   }
 
@@ -483,81 +697,164 @@ class ProfileAndDeviceIdFragmentTest {
     onView(isRoot()).perform(orientationLandscape())
     testCoroutineDispatchers.runCurrent()
 
-    onView(syncStatusAt(position = 2))
+    onSyncStatusAt(position = 2)
       .check(matches(withText(containsString("No data has been collected yet to upload"))))
   }
 
   @Test
   fun testFragment_eventLogged_waitingForUpload_rotate_profileDataIsCurrentlyUploading() {
     initializeActivityAndAddFragment()
-    queueAnalyticsEvent()
-    syncStatusManager.setSyncStatus(SyncStatusManager.SyncStatus.DATA_UPLOADING)
+    disconnectNetwork() // Ensure events are cached.
+    logAnalyticsEvent()
+    syncStatusManager.forceSyncStatus(SyncStatus.DATA_UPLOADING)
+    testCoroutineDispatchers.runCurrent()
 
     onView(isRoot()).perform(orientationLandscape())
     testCoroutineDispatchers.runCurrent()
 
-    onView(syncStatusAt(position = 2))
+    onSyncStatusAt(position = 2)
       .check(matches(withText(containsString("Profile data is currently uploading"))))
   }
 
   @Test
   fun testFragment_eventLogged_waitForUpload_rotate_profileDataIsUploaded() {
     initializeActivityAndAddFragment()
-    queueAnalyticsEvent()
+    disconnectNetwork() // Ensure events are cached.
+    logAnalyticsEvent()
+    connectNetwork()
     flushEventWorkerQueue()
 
     onView(isRoot()).perform(orientationLandscape())
     testCoroutineDispatchers.runCurrent()
 
-    onView(syncStatusAt(position = 2))
+    onSyncStatusAt(position = 2)
       .check(matches(withText(containsString("All profile data has been uploaded"))))
   }
 
   @Test
-  fun testFragment_eventsLogged_networkError_rotate_profileDataHasError() {
+  fun testFragment_eventsLogged_uploadError_rotate_profileDataHasError() {
     initializeActivityAndAddFragment()
-    queueAnalyticsEvent()
-    syncStatusManager.setSyncStatus(SyncStatusManager.SyncStatus.NETWORK_ERROR)
+    disconnectNetwork() // Ensure events are cached.
+    logAnalyticsEvent()
+    syncStatusManager.forceSyncStatus(SyncStatus.UPLOAD_ERROR)
+    testCoroutineDispatchers.runCurrent()
 
     onView(isRoot()).perform(orientationLandscape())
     testCoroutineDispatchers.runCurrent()
 
-    onView(syncStatusAt(position = 2))
-      .check(
-        matches(
-          withText(
-            containsString(
-              "Please connect to a WiFi or Cellular network in order to upload profile data"
-            )
-          )
-        )
-      )
+    onSyncStatusAt(position = 2)
+      .check(matches(withText(containsString("Something went wrong when trying to upload events"))))
   }
 
   @Test
-  fun testFragment_multipleProfiles_clickShareIds_sendsIntentWithIdsText() {
-    profileTestHelper.addMoreProfiles(numProfiles = 5)
+  fun testFragment_multipleProfiles_clickShareIdsAndLogs_sendsIntentWithIdsAndLogsText() {
+    // Use fake time so that the generated event logs are consistent across runs.
+    fakeOppiaClock.setFakeTimeMode(FakeOppiaClock.FakeTimeMode.MODE_FIXED_FAKE_TIME)
+    profileTestHelper.addMoreProfiles(numProfiles = 2)
     initializeActivityAndAddFragment()
-
-    onView(withId(R.id.profile_and_device_id_recycler_view)).perform(
-      actionOnItemAtPosition<RecyclerView.ViewHolder>(8, scrollTo())
-    )
-    onView(withText(R.string.learner_analytics_share_ids_button_text)).perform(click())
+    disconnectNetwork() // Ensure events are cached.
+
+    // Log & upload some events, then enqueue others.
+    logThreeAnalyticsEvents(profileId = null)
+    logTwoAnalyticsEvents(profileId = ADMIN_PROFILE_ID)
+    logAnalyticsEvent(profileId = LEARNER_PROFILE_ID_0)
+    logTwoAnalyticsEvents(profileId = LEARNER_PROFILE_ID_1)
+    connectOnlyToFlushWorkerQueue()
+    logAnalyticsEvent(profileId = null)
+    logThreeAnalyticsEvents(profileId = ADMIN_PROFILE_ID)
+    logTwoAnalyticsEvents(profileId = LEARNER_PROFILE_ID_0)
+    logAnalyticsEvent(profileId = LEARNER_PROFILE_ID_1)
+    connectNetwork()
+    logAnalyticsEvent(profileId = null) // Log an event to trigger tracking the network change.
+
+    onShareIdsAndEventsButtonAt(position = 5).perform(click())
     testCoroutineDispatchers.runCurrent()
 
     val expectedShareText =
       """
-      Oppia app installation ID: c62db3c65fb1
+      Oppia app installation ID: 1216f42c89ec
       - Profile name: Admin, learner ID: a9fe66ab
+        - Uploading learner events: 3
+        - Uploaded learner events: 2
+        - Uploading uncategorized events: 1
+        - Uploaded uncategorized events: 4
       - Profile name: A, learner ID: c368b501
+        - Uploading learner events: 2
+        - Uploaded learner events: 1
       - Profile name: B, learner ID: 74facac7
-      - Profile name: C, learner ID: 413f22b0
-      - Profile name: D, learner ID: 63f83ba4
-      - Profile name: E, learner ID: 3772df24
+        - Uploading learner events: 1
+        - Uploaded learner events: 2
+      Current sync status: Waiting to schedule data uploading worker….
+      Encoded event logs:
+      H4sIAAAAAAAAAOPSlGBUUj3FqMTFX5JaXBKfk5pYlJdaFJ+ZIgQRyMwrLknMyQEKcBkSrVSLwYjBisGJ
+      gU5ajEnVwsTBSDdNTELEBzGNlJIepORoISdAydHERJ4m4sMLAFFY60EUAwAA
       """.trimIndent()
-    intended(hasAction(Intent.ACTION_SEND))
-    intended(hasType("text/plain"))
-    intended(hasExtra(Intent.EXTRA_TEXT, expectedShareText))
+    val intents = getIntents()
+    assertThat(intents).hasSize(1)
+    assertThat(intents.single()).hasAction(Intent.ACTION_SEND)
+    assertThat(intents.single()).hasType("text/plain")
+    assertThat(intents.single()).extras().containsKey(Intent.EXTRA_TEXT)
+    assertThat(intents.single()).extras().string(Intent.EXTRA_TEXT).isEqualTo(expectedShareText)
+  }
+
+  @Test
+  fun testFragment_noEventsPending_uploadLogsButtonDisabled() {
+    profileTestHelper.addMoreProfiles(numProfiles = 1)
+    initializeActivityAndAddFragment()
+    disconnectNetwork() // Ensure events are cached.
+
+    // The upload button should be disabled when there are no events to upload.
+    onUploadLogsButtonAt(position = 4).check(matches(not(isEnabled())))
+  }
+
+  @Test
+  fun testFragment_multipleEventsPending_noConnection_uploadLogsButtonDisabled() {
+    profileTestHelper.addMoreProfiles(numProfiles = 1)
+    initializeActivityAndAddFragment()
+    disconnectNetwork() // Ensure events are cached.
+
+    logAnalyticsEvent(profileId = null)
+    logAnalyticsEvent(profileId = ADMIN_PROFILE_ID)
+    logAnalyticsEvent(profileId = LEARNER_PROFILE_ID_0)
+
+    // The button is still disabled since there's no internet connection.
+    onUploadLogsButtonAt(position = 4).check(matches(not(isEnabled())))
+  }
+
+  @Test
+  fun testFragment_multipleEventsPending_uploadLogsButtonEnabled() {
+    profileTestHelper.addMoreProfiles(numProfiles = 1)
+    initializeActivityAndAddFragment()
+    disconnectNetwork() // Ensure events are cached.
+
+    logAnalyticsEvent(profileId = null)
+    logAnalyticsEvent(profileId = ADMIN_PROFILE_ID)
+    logAnalyticsEvent(profileId = LEARNER_PROFILE_ID_0)
+    connectNetwork()
+    logAnalyticsEvent(profileId = null) // Log an event to trigger tracking the network change.
+
+    // With events pending & connectivity, the upload button should now be available to press.
+    onUploadLogsButtonAt(position = 4).check(matches(isEnabled()))
+  }
+
+  @Test
+  fun testFragment_multipleEventsPending_clickUploadLogs_wait_uploadsEventLogs() {
+    profileTestHelper.addMoreProfiles(numProfiles = 1)
+    initializeActivityAndAddFragment()
+    disconnectNetwork() // Ensure events are cached.
+    logAnalyticsEvent(profileId = null)
+    logAnalyticsEvent(profileId = ADMIN_PROFILE_ID)
+    logAnalyticsEvent(profileId = LEARNER_PROFILE_ID_0)
+    connectNetwork()
+    logAnalyticsEvent(profileId = null) // Log an event to trigger tracking the network change.
+    fakeAnalyticsEventLogger.clearAllEvents()
+
+    // Click the 'upload logs' button and wait.
+    onUploadLogsButtonAt(position = 4).perform(click())
+    testCoroutineDispatchers.runCurrent()
+
+    // The events should be uploaded.
+    assertThat(fakeAnalyticsEventLogger.getEventListCount()).isEqualTo(3)
   }
 
   private fun initializeActivityAndAddFragment() {
@@ -568,25 +865,55 @@ class ProfileAndDeviceIdFragmentTest {
         .add(R.id.test_fragment_placeholder, ProfileAndDeviceIdFragment())
         .commitNow()
     }
+    connectNetwork() // Start with internet connectivity.
+    testCoroutineDispatchers.runCurrent()
+  }
+
+  private fun scrollTo(position: Int) {
+    onView(withId(R.id.profile_and_device_id_recycler_view))
+      .perform(actionOnItemAtPosition<RecyclerView.ViewHolder>(position, scrollTo()))
     testCoroutineDispatchers.runCurrent()
   }
 
-  private fun deviceIdLabelAt(position: Int) = profileListItemAt(position, R.id.device_id_label)
+  private fun onDeviceIdLabelAt(position: Int) = onProfileListItemAt(position, R.id.device_id_label)
+
+  private fun onDeviceIdCopyButtonAt(position: Int) =
+    onProfileListItemAt(position, R.id.device_id_copy_button)
+
+  private fun onProfileNameAt(position: Int) =
+    onProfileListItemAt(position, R.id.profile_id_view_profile_name)
+
+  private fun onLearnerIdAt(position: Int) =
+    onProfileListItemAt(position, R.id.profile_id_view_learner_id)
+
+  private fun onLearnerIdCopyButtonAt(position: Int) =
+    onProfileListItemAt(position, R.id.learner_id_copy_button)
+
+  private fun onAwaitingUploadLearnerEventsCountAt(position: Int) =
+    onProfileListItemAt(position, R.id.learner_events_waiting_upload_count)
 
-  private fun deviceIdCopyButtonAt(position: Int) =
-    profileListItemAt(position, R.id.device_id_copy_button)
+  private fun onUploadedLearnerEventsCountAt(position: Int) =
+    onProfileListItemAt(position, R.id.learner_events_uploaded_count)
 
-  private fun profileNameAt(position: Int) =
-    profileListItemAt(position, R.id.profile_id_view_profile_name)
+  private fun onAwaitingUploadUncategorizedEventsCountAt(position: Int) =
+    onProfileListItemAt(position, R.id.uncategorized_events_waiting_upload_count)
 
-  private fun learnerIdAt(position: Int) =
-    profileListItemAt(position, R.id.profile_id_view_learner_id)
+  private fun onUploadedUncategorizedEventsCountAt(position: Int) =
+    onProfileListItemAt(position, R.id.uncategorized_events_uploaded_count)
 
-  private fun learnerIdCopyButtonAt(position: Int) =
-    profileListItemAt(position, R.id.learner_id_copy_button)
+  private fun onSyncStatusAt(position: Int) =
+    onProfileListItemAt(position, R.id.learner_analytics_sync_status_text_view)
 
-  private fun syncStatusAt(position: Int) =
-    profileListItemAt(position, R.id.learner_analytics_sync_status_text_view)
+  private fun onShareIdsAndEventsButtonAt(position: Int) =
+    onProfileListItemAt(position, R.id.learner_analytics_share_ids_and_events_button)
+
+  private fun onUploadLogsButtonAt(position: Int) =
+    onProfileListItemAt(position, R.id.learner_analytics_upload_logs_now_button)
+
+  private fun onProfileListItemAt(position: Int, @IdRes viewId: Int): ViewInteraction {
+    scrollTo(position)
+    return onView(profileListItemAt(position, viewId))
+  }
 
   private fun profileListItemAt(position: Int, @IdRes viewId: Int): Matcher<View> {
     return atPositionOnView(
@@ -601,19 +928,29 @@ class ProfileAndDeviceIdFragmentTest {
     @Suppress("UsePropertyAccessSyntax")
     clipboardManager.setPrimaryClip(
       ClipData.newPlainText(
-        /* label= */ "Label of text from another app", /* text= */ "Text copied from another app"
+        /* label = */ "Label of text from another app", /* text = */ "Text copied from another app"
       )
     )
     testCoroutineDispatchers.runCurrent()
   }
 
-  private fun queueAnalyticsEvent() {
+  private fun logAnalyticsEvent(profileId: ProfileId? = null) {
     learnerAnalyticsLogger.logAppInForeground(
-      installationId = "test_install_id", profileId = null, learnerId = "test_learner_id"
+      installationId = "test_install_id", profileId, learnerId = "test_learner_id"
     )
     testCoroutineDispatchers.runCurrent()
   }
 
+  private fun logTwoAnalyticsEvents(profileId: ProfileId? = null) {
+    logAnalyticsEvent(profileId)
+    logAnalyticsEvent(profileId)
+  }
+
+  private fun logThreeAnalyticsEvents(profileId: ProfileId? = null) {
+    logTwoAnalyticsEvents(profileId)
+    logAnalyticsEvent(profileId)
+  }
+
   private fun flushEventWorkerQueue() {
     val workManager = WorkManager.getInstance(context)
 
@@ -626,6 +963,20 @@ class ProfileAndDeviceIdFragmentTest {
     testCoroutineDispatchers.runCurrent()
   }
 
+  private fun disconnectNetwork() {
+    networkConnectionUtil.setCurrentConnectionStatus(ProdConnectionStatus.NONE)
+  }
+
+  private fun connectNetwork() {
+    networkConnectionUtil.setCurrentConnectionStatus(ProdConnectionStatus.LOCAL)
+  }
+
+  private fun connectOnlyToFlushWorkerQueue() {
+    connectNetwork()
+    flushEventWorkerQueue()
+    disconnectNetwork()
+  }
+
   private fun setUpTestApplicationComponent() {
     ApplicationProvider.getApplicationContext<TestApplication>().inject(this)
   }
@@ -665,7 +1016,7 @@ class ProfileAndDeviceIdFragmentTest {
       ExplorationStorageModule::class, NetworkModule::class, NetworkConfigProdModule::class,
       NetworkConnectionUtilDebugModule::class, NetworkConnectionDebugUtilModule::class,
       AssetModule::class, LocaleProdModule::class, ActivityRecreatorTestModule::class,
-      SyncStatusModule::class, SplitScreenInteractionModule::class,
+      SyncStatusTestModule::class, SplitScreenInteractionModule::class,
       NumericExpressionInputModule::class, AlgebraicExpressionInputModule::class,
       MathEquationInputModule::class, MetricLogSchedulerModule::class,
       TestingBuildFlavorModule::class, EventLoggingConfigurationModule::class,
@@ -697,4 +1048,16 @@ class ProfileAndDeviceIdFragmentTest {
 
     override fun getApplicationInjector(): ApplicationInjector = component
   }
+
+  private companion object {
+    private const val DEFAULT_APPLICATION_ID = 123456789L
+
+    private val ADMIN_PROFILE_ID = createProfileId(internalProfileId = 0)
+    private val LEARNER_PROFILE_ID_0 = createProfileId(internalProfileId = 1)
+    private val LEARNER_PROFILE_ID_1 = createProfileId(internalProfileId = 2)
+
+    private fun createProfileId(internalProfileId: Int) = ProfileId.newBuilder().apply {
+      internalId = internalProfileId
+    }.build()
+  }
 }
diff --git a/app/src/sharedTest/java/org/oppia/android/app/databinding/BUILD.bazel b/app/src/sharedTest/java/org/oppia/android/app/databinding/BUILD.bazel
index cf3ebcd513d..1ff49d1652e 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/databinding/BUILD.bazel
+++ b/app/src/sharedTest/java/org/oppia/android/app/databinding/BUILD.bazel
@@ -3,29 +3,8 @@ Tests for UI databinding utilities and adapters.
 """
 
 load("@dagger//:workspace_defs.bzl", "dagger_rules")
-load("//:oppia_android_test.bzl", "oppia_android_test")
-
-# Resource shim needed so that tests can build in both Gradle & Bazel.
-_TEST_FILES = [
-    "MarginBindingAdaptersTest.kt",
-    "StateAssemblerMarginBindingAdaptersTest.kt",
-    "StateAssemblerPaddingBindingAdaptersTest.kt",
-    "ViewBindingAdaptersTest.kt",
-]
-
-# TODO(#1617): Remove genrules post-gradle
-[
-    genrule(
-        name = "update_" + file[0:-3],
-        srcs = [file],
-        outs = [file[0:-3] + "_updated.kt"],
-        cmd = """
-     cat $(SRCS) |
-     sed 's/import org.oppia.android.R/import org.oppia.android.app.databinding.R/g' > $(OUTS)
-     """,
-    )
-    for file in _TEST_FILES
-]
+load("//app:app_test.bzl", "app_test")
+load("//app:test_with_resources.bzl", "test_with_resources")
 
 genrule(
     name = "update_DrawableBindingAdaptersTest",
@@ -62,12 +41,46 @@ genrule(
     """,
 )
 
-oppia_android_test(
+app_test(
+    name = "CircularProgressIndicatorAdaptersTest",
+    processed_src = test_with_resources("CircularProgressIndicatorAdaptersTest.kt"),
+    test_class = "org.oppia.android.app.databinding.CircularProgressIndicatorAdaptersTest",
+    deps = [
+        ":dagger",
+        "//app",
+        "//app:test_deps",
+        "//app/src/main/java/org/oppia/android/app/activity:activity_intent_factories_shim",
+        "//app/src/main/java/org/oppia/android/app/application:application_component",
+        "//app/src/main/java/org/oppia/android/app/application:application_injector",
+        "//app/src/main/java/org/oppia/android/app/application:application_injector_provider",
+        "//app/src/main/java/org/oppia/android/app/application:common_application_modules",
+        "//app/src/main/java/org/oppia/android/app/application/testing:testing_build_flavor_module",
+        "//app/src/main/java/org/oppia/android/app/translation/testing:test_module",
+        "//domain",
+        "//testing",
+        "//testing/src/main/java/org/oppia/android/testing/junit:initialize_default_locale_rule",
+        "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module",
+        "//testing/src/main/java/org/oppia/android/testing/threading:test_module",
+        "//testing/src/main/java/org/oppia/android/testing/time:test_module",
+        "//third_party:androidx_test_ext_junit",
+        "//third_party:androidx_test_ext_truth",
+        "//third_party:junit_junit",
+        "//third_party:org_robolectric_robolectric",
+        "//third_party:robolectric_android-all",
+        "//utility/src/main/java/org/oppia/android/util/accessibility:test_module",
+        "//utility/src/main/java/org/oppia/android/util/caching/testing:caching_test_module",
+        "//utility/src/main/java/org/oppia/android/util/data:data_providers",
+        "//utility/src/main/java/org/oppia/android/util/logging:prod_module",
+        "//utility/src/main/java/org/oppia/android/util/logging:standard_event_logging_configuration_module",
+        "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module",
+        "//utility/src/main/java/org/oppia/android/util/networking:debug_module",
+    ],
+)
+
+app_test(
     name = "DrawableBindingAdaptersTest",
-    srcs = ["DrawableBindingAdaptersTest_updated.kt"],
-    custom_package = "org.oppia.android.app.databinding",
+    processed_src = "DrawableBindingAdaptersTest_updated.kt",
     test_class = "org.oppia.android.app.databinding.DrawableBindingAdaptersTest",
-    test_manifest = "//app:test_manifest",
     deps = [
         ":dagger",
         "//app",
@@ -100,12 +113,10 @@ oppia_android_test(
     ],
 )
 
-oppia_android_test(
+app_test(
     name = "ImageViewBindingAdaptersTest",
-    srcs = ["ImageViewBindingAdaptersTest_updated.kt"],
-    custom_package = "org.oppia.android.app.databinding",
+    processed_src = "ImageViewBindingAdaptersTest_updated.kt",
     test_class = "org.oppia.android.app.databinding.ImageViewBindingAdaptersTest",
-    test_manifest = "//app:test_manifest",
     deps = [
         ":dagger",
         "//app",
@@ -138,12 +149,10 @@ oppia_android_test(
     ],
 )
 
-oppia_android_test(
+app_test(
     name = "MarginBindingAdaptersTest",
-    srcs = ["MarginBindingAdaptersTest_updated.kt"],
-    custom_package = "org.oppia.android.app.databinding",
+    processed_src = test_with_resources("MarginBindingAdaptersTest.kt"),
     test_class = "org.oppia.android.app.databinding.MarginBindingAdaptersTest",
-    test_manifest = "//app:test_manifest",
     deps = [
         ":dagger",
         "//app",
@@ -176,12 +185,10 @@ oppia_android_test(
     ],
 )
 
-oppia_android_test(
+app_test(
     name = "StateAssemblerMarginBindingAdaptersTest",
-    srcs = ["StateAssemblerMarginBindingAdaptersTest_updated.kt"],
-    custom_package = "org.oppia.android.app.databinding",
+    processed_src = test_with_resources("StateAssemblerMarginBindingAdaptersTest.kt"),
     test_class = "org.oppia.android.app.databinding.StateAssemblerMarginBindingAdaptersTest",
-    test_manifest = "//app:test_manifest",
     deps = [
         ":dagger",
         "//app",
@@ -214,12 +221,10 @@ oppia_android_test(
     ],
 )
 
-oppia_android_test(
+app_test(
     name = "StateAssemblerPaddingBindingAdaptersTest",
-    srcs = ["StateAssemblerPaddingBindingAdaptersTest_updated.kt"],
-    custom_package = "org.oppia.android.app.databinding",
+    processed_src = test_with_resources("StateAssemblerPaddingBindingAdaptersTest.kt"),
     test_class = "org.oppia.android.app.databinding.StateAssemblerPaddingBindingAdaptersTest",
-    test_manifest = "//app:test_manifest",
     deps = [
         ":dagger",
         "//app",
@@ -252,12 +257,10 @@ oppia_android_test(
     ],
 )
 
-oppia_android_test(
+app_test(
     name = "TextViewBindingAdaptersTest",
-    srcs = ["TextViewBindingAdaptersTest_updated.kt"],
-    custom_package = "org.oppia.android.app.databinding",
+    processed_src = "TextViewBindingAdaptersTest_updated.kt",
     test_class = "org.oppia.android.app.databinding.TextViewBindingAdaptersTest",
-    test_manifest = "//app:test_manifest",
     deps = [
         ":dagger",
         "//app",
@@ -290,12 +293,10 @@ oppia_android_test(
     ],
 )
 
-oppia_android_test(
+app_test(
     name = "ViewBindingAdaptersTest",
-    srcs = ["ViewBindingAdaptersTest_updated.kt"],
-    custom_package = "org.oppia.android.app.databinding",
+    processed_src = test_with_resources("ViewBindingAdaptersTest.kt"),
     test_class = "org.oppia.android.app.databinding.ViewBindingAdaptersTest",
-    test_manifest = "//app:test_manifest",
     deps = [
         ":dagger",
         "//app",
diff --git a/app/src/sharedTest/java/org/oppia/android/app/databinding/CircularProgressIndicatorAdaptersTest.kt b/app/src/sharedTest/java/org/oppia/android/app/databinding/CircularProgressIndicatorAdaptersTest.kt
new file mode 100644
index 00000000000..e0bc720f683
--- /dev/null
+++ b/app/src/sharedTest/java/org/oppia/android/app/databinding/CircularProgressIndicatorAdaptersTest.kt
@@ -0,0 +1,329 @@
+package org.oppia.android.app.databinding
+
+import android.app.Application
+import androidx.annotation.IdRes
+import androidx.appcompat.app.AppCompatActivity
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.espresso.intent.Intents
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.android.material.progressindicator.CircularProgressIndicator
+import com.google.android.material.progressindicator.CircularProgressIndicatorSpec
+import com.google.android.material.progressindicator.DeterminateDrawable
+import com.google.common.truth.Truth.assertThat
+import dagger.Component
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.oppia.android.R
+import org.oppia.android.app.activity.ActivityComponent
+import org.oppia.android.app.activity.ActivityComponentFactory
+import org.oppia.android.app.activity.route.ActivityRouterModule
+import org.oppia.android.app.application.ApplicationComponent
+import org.oppia.android.app.application.ApplicationInjector
+import org.oppia.android.app.application.ApplicationInjectorProvider
+import org.oppia.android.app.application.ApplicationModule
+import org.oppia.android.app.application.ApplicationStartupListenerModule
+import org.oppia.android.app.application.testing.TestingBuildFlavorModule
+import org.oppia.android.app.databinding.CircularProgressIndicatorAdapters.setAnimatedProgress
+import org.oppia.android.app.devoptions.DeveloperOptionsModule
+import org.oppia.android.app.devoptions.DeveloperOptionsStarterModule
+import org.oppia.android.app.player.state.itemviewmodel.SplitScreenInteractionModule
+import org.oppia.android.app.shim.ViewBindingShimModule
+import org.oppia.android.app.testing.CircularProgressIndicatorAdaptersTestActivity
+import org.oppia.android.app.translation.testing.ActivityRecreatorTestModule
+import org.oppia.android.data.backends.gae.NetworkConfigProdModule
+import org.oppia.android.data.backends.gae.NetworkModule
+import org.oppia.android.domain.classify.InteractionsModule
+import org.oppia.android.domain.classify.rules.algebraicexpressioninput.AlgebraicExpressionInputModule
+import org.oppia.android.domain.classify.rules.continueinteraction.ContinueModule
+import org.oppia.android.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule
+import org.oppia.android.domain.classify.rules.fractioninput.FractionInputModule
+import org.oppia.android.domain.classify.rules.imageClickInput.ImageClickInputModule
+import org.oppia.android.domain.classify.rules.itemselectioninput.ItemSelectionInputModule
+import org.oppia.android.domain.classify.rules.mathequationinput.MathEquationInputModule
+import org.oppia.android.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule
+import org.oppia.android.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule
+import org.oppia.android.domain.classify.rules.numericexpressioninput.NumericExpressionInputModule
+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.exploration.ExplorationStorageModule
+import org.oppia.android.domain.hintsandsolution.HintsAndSolutionConfigModule
+import org.oppia.android.domain.hintsandsolution.HintsAndSolutionProdModule
+import org.oppia.android.domain.onboarding.ExpirationMetaDataRetrieverModule
+import org.oppia.android.domain.oppialogger.LogStorageModule
+import org.oppia.android.domain.oppialogger.LoggingIdentifierModule
+import org.oppia.android.domain.oppialogger.analytics.ApplicationLifecycleModule
+import org.oppia.android.domain.oppialogger.analytics.CpuPerformanceSnapshotterModule
+import org.oppia.android.domain.oppialogger.logscheduler.MetricLogSchedulerModule
+import org.oppia.android.domain.oppialogger.loguploader.LogReportWorkerModule
+import org.oppia.android.domain.platformparameter.PlatformParameterModule
+import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule
+import org.oppia.android.domain.question.QuestionModule
+import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule
+import org.oppia.android.domain.workmanager.WorkManagerConfigurationModule
+import org.oppia.android.testing.OppiaTestRule
+import org.oppia.android.testing.RunOn
+import org.oppia.android.testing.TestImageLoaderModule
+import org.oppia.android.testing.TestLogReportingModule
+import org.oppia.android.testing.TestPlatform
+import org.oppia.android.testing.junit.InitializeDefaultLocaleRule
+import org.oppia.android.testing.robolectric.RobolectricModule
+import org.oppia.android.testing.threading.TestCoroutineDispatchers
+import org.oppia.android.testing.threading.TestDispatcherModule
+import org.oppia.android.testing.time.FakeOppiaClockModule
+import org.oppia.android.util.accessibility.AccessibilityTestModule
+import org.oppia.android.util.caching.AssetModule
+import org.oppia.android.util.caching.testing.CachingTestModule
+import org.oppia.android.util.gcsresource.GcsResourceModule
+import org.oppia.android.util.locale.LocaleProdModule
+import org.oppia.android.util.logging.EventLoggingConfigurationModule
+import org.oppia.android.util.logging.LoggerModule
+import org.oppia.android.util.logging.SyncStatusModule
+import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule
+import org.oppia.android.util.math.isApproximatelyEqualTo
+import org.oppia.android.util.networking.NetworkConnectionDebugUtilModule
+import org.oppia.android.util.networking.NetworkConnectionUtilDebugModule
+import org.oppia.android.util.parser.html.HtmlParserEntityTypeModule
+import org.oppia.android.util.parser.image.ImageParsingModule
+import org.robolectric.annotation.Config
+import org.robolectric.annotation.LooperMode
+import java.lang.reflect.Field
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/** Tests for ``CircularProgressIndicator`` data-binding adapters. */
+// Function name: test names are conventionally named with underscores.
+@Suppress("FunctionName")
+@RunWith(AndroidJUnit4::class)
+@LooperMode(LooperMode.Mode.PAUSED)
+@Config(
+  application = CircularProgressIndicatorAdaptersTest.TestApplication::class,
+  qualifiers = "port-xxhdpi"
+)
+class CircularProgressIndicatorAdaptersTest {
+  @get:Rule val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
+  @get:Rule val oppiaTestRule = OppiaTestRule()
+  @get:Rule
+  var activityRule =
+    ActivityScenarioRule<CircularProgressIndicatorAdaptersTestActivity>(
+      CircularProgressIndicatorAdaptersTestActivity.createIntent(
+        ApplicationProvider.getApplicationContext()
+      )
+    )
+
+  @Inject lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
+
+  @Before
+  fun setUp() {
+    setUpTestApplicationComponent()
+    Intents.init()
+  }
+
+  @After
+  fun tearDown() {
+    Intents.release()
+  }
+
+  @Test
+  fun testSetAnimatedProgress_autoBinding_progressOfZero_doesNotChangeIndicatorProgress() {
+    activityRule.scenario.onActivity { it.viewModel.currentAutoProgress.value = 0 }
+    testCoroutineDispatchers.runCurrent()
+
+    activityRule.scenario.onActivity {
+      // Setting the progress to 0 should not change the view.
+      val view = it.findAutoBoundIndicatorView()
+      assertThat(view.progress).isEqualTo(it.viewModel.defaultInitialValue)
+    }
+  }
+
+  @Test
+  fun testSetAnimatedProgress_autoBinding_progressOfNonZero_updatesIndicatorProgress() {
+    activityRule.scenario.onActivity { it.viewModel.currentAutoProgress.value = 30 }
+    testCoroutineDispatchers.runCurrent()
+
+    activityRule.scenario.onActivity {
+      // Setting the progress to nonzero should change the view.
+      val view = it.findAutoBoundIndicatorView()
+      assertThat(view.progress).isNotEqualTo(it.viewModel.defaultInitialValue)
+      assertThat(view.progress).isEqualTo(30)
+    }
+  }
+
+  @Test
+  @RunOn(TestPlatform.ROBOLECTRIC) // Checking animation state could be flaky in Espresso.
+  fun testSetAnimatedProgress_autoBinding_progressOfNonZero_animatesIndicatorProgress() {
+    activityRule.scenario.onActivity {
+      // Note that this needs to be done in the same 'onActivity' as checking the progress so as to
+      // not fully run the animation through when checking if it's active.
+      it.viewModel.currentAutoProgress.value = 30
+      it.viewModel.notifyChange()
+      it.binding.executePendingBindings()
+
+      // Setting the progress to nonzero should animate the progress change.
+      assertThat(it.findAutoBoundIndicatorView().isProgressSetToAnimate()).isTrue()
+    }
+  }
+
+  @Test
+  fun testSetAnimatedProgress_directCall_progressOfZero_doesNotChangeIndicatorProgress() {
+    // Default the initial progress of the indicator view.
+    activityRule.scenario.onActivity {
+      it.findUnboundIndicatorView().progress = it.viewModel.defaultInitialValue
+    }
+    testCoroutineDispatchers.runCurrent()
+
+    // The view needs to be changed directly since its progress isn't auto-bound to the adapter.
+    activityRule.scenario.onActivity {
+      setAnimatedProgress(it.findUnboundIndicatorView(), /* progress = */ 0)
+    }
+    testCoroutineDispatchers.runCurrent()
+
+    activityRule.scenario.onActivity {
+      // Setting the progress to 0 should not change the view.
+      assertThat(it.findUnboundIndicatorView().progress).isEqualTo(it.viewModel.defaultInitialValue)
+    }
+  }
+
+  @Test
+  fun testSetAnimatedProgress_directCall_progressOfNonZero_updatesIndicatorProgress() {
+    // Default the initial progress of the indicator view.
+    activityRule.scenario.onActivity {
+      it.findUnboundIndicatorView().progress = it.viewModel.defaultInitialValue
+    }
+    testCoroutineDispatchers.runCurrent()
+
+    // The view needs to be changed directly since its progress isn't auto-bound to the adapter.
+    activityRule.scenario.onActivity {
+      setAnimatedProgress(it.findUnboundIndicatorView(), /* progress = */ 30)
+    }
+    testCoroutineDispatchers.runCurrent()
+
+    activityRule.scenario.onActivity {
+      // Setting the progress to nonzero should change the view.
+      val view = it.findUnboundIndicatorView()
+      assertThat(view.progress).isNotEqualTo(it.viewModel.defaultInitialValue)
+      assertThat(view.progress).isEqualTo(30)
+    }
+  }
+
+  @Test
+  @RunOn(TestPlatform.ROBOLECTRIC) // Checking animation state could be flaky in Espresso.
+  fun testSetAnimatedProgress_directCall_progressOfNonZero_animatesIndicatorProgress() {
+    // Default the initial progress of the indicator view.
+    activityRule.scenario.onActivity {
+      it.findUnboundIndicatorView().progress = it.viewModel.defaultInitialValue
+    }
+    testCoroutineDispatchers.runCurrent()
+
+    activityRule.scenario.onActivity {
+      // The view needs to be changed directly since its progress isn't auto-bound to the adapter.
+      // Note that this needs to be done in the same 'onActivity' as checking the progress so as to
+      // not fully run the animation through when checking if it's active.
+      val indicatorView = it.findUnboundIndicatorView()
+      setAnimatedProgress(indicatorView, /* progress = */ 30)
+
+      // Setting the progress to nonzero should animate the progress change.
+      assertThat(indicatorView.isProgressSetToAnimate()).isTrue()
+    }
+  }
+
+  private fun setUpTestApplicationComponent() {
+    ApplicationProvider.getApplicationContext<TestApplication>().inject(this)
+  }
+
+  private fun AppCompatActivity.findAutoBoundIndicatorView() =
+    findProgressIndicatorView(R.id.circular_progress_indicator_test_bound_view)
+
+  private fun AppCompatActivity.findUnboundIndicatorView() =
+    findProgressIndicatorView(R.id.circular_progress_indicator_test_unbound_view)
+
+  private fun AppCompatActivity.findProgressIndicatorView(
+    @IdRes viewId: Int
+  ): CircularProgressIndicator = findViewById(viewId)
+
+  /**
+   * Returns whether, at the time of calling this method, this [CircularProgressIndicator] has been
+   * set to animate its progress. Note that this method will skip the indicator's animation as part
+   * of verifying this state.
+   */
+  private fun CircularProgressIndicator.isProgressSetToAnimate(): Boolean {
+    // This is a hacky way to introspect implementation state of the indicator to verify that it's
+    // animating since the API of the class provides no way to check this.
+    val drawable = checkNotNull(progressDrawable) { "Missing progress drawable: $this." }
+    val currentProgressFraction = drawable.getCurrentIndicatorFraction()
+    drawable.jumpToCurrentState() // Simulate the animation being skipped.
+    val updatedProgressFraction = drawable.getCurrentIndicatorFraction()
+    // If the indicator fraction changes, that indicates that the indicator was set up to animate
+    // (since it didn't jump straight to its latest progress).
+    return !currentProgressFraction.isApproximatelyEqualTo(updatedProgressFraction)
+  }
+
+  private fun DeterminateDrawable<CircularProgressIndicatorSpec>.getCurrentIndicatorFraction() =
+    javaClass.getAccessibleDeclaredField("indicatorFraction").getFloat(this)
+
+  private fun <T> Class<T>.getAccessibleDeclaredField(name: String): Field {
+    return checkNotNull(declaredFields.find { it.name == name }) {
+      "Failed to find field with name '$name' in class: $this."
+    }.also { it.isAccessible = true }
+  }
+
+  // TODO(#59): Figure out a way to reuse modules instead of needing to re-declare them.
+  @Singleton
+  @Component(
+    modules = [
+      RobolectricModule::class,
+      PlatformParameterModule::class, PlatformParameterSingletonModule::class,
+      TestDispatcherModule::class, ApplicationModule::class,
+      LoggerModule::class, ContinueModule::class, FractionInputModule::class,
+      ItemSelectionInputModule::class, MultipleChoiceInputModule::class,
+      NumberWithUnitsRuleModule::class, NumericInputRuleModule::class, TextInputRuleModule::class,
+      DragDropSortInputModule::class, ImageClickInputModule::class, InteractionsModule::class,
+      GcsResourceModule::class, TestImageLoaderModule::class, ImageParsingModule::class,
+      HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class,
+      AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class,
+      PrimeTopicAssetsControllerModule::class, ExpirationMetaDataRetrieverModule::class,
+      ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class,
+      ApplicationStartupListenerModule::class, LogReportWorkerModule::class,
+      HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class,
+      FirebaseLogUploaderModule::class, FakeOppiaClockModule::class,
+      DeveloperOptionsStarterModule::class, DeveloperOptionsModule::class,
+      ExplorationStorageModule::class, NetworkModule::class, NetworkConfigProdModule::class,
+      NetworkConnectionUtilDebugModule::class, NetworkConnectionDebugUtilModule::class,
+      AssetModule::class, LocaleProdModule::class, ActivityRecreatorTestModule::class,
+      NumericExpressionInputModule::class, AlgebraicExpressionInputModule::class,
+      MathEquationInputModule::class, SplitScreenInteractionModule::class,
+      LoggingIdentifierModule::class, ApplicationLifecycleModule::class,
+      SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class,
+      EventLoggingConfigurationModule::class, ActivityRouterModule::class,
+      CpuPerformanceSnapshotterModule::class
+    ]
+  )
+  interface TestApplicationComponent : ApplicationComponent {
+    @Component.Builder
+    interface Builder : ApplicationComponent.Builder
+
+    fun inject(test: CircularProgressIndicatorAdaptersTest)
+  }
+
+  class TestApplication : Application(), ActivityComponentFactory, ApplicationInjectorProvider {
+    private val component: TestApplicationComponent by lazy {
+      DaggerCircularProgressIndicatorAdaptersTest_TestApplicationComponent.builder()
+        .setApplication(this)
+        .build() as TestApplicationComponent
+    }
+
+    fun inject(test: CircularProgressIndicatorAdaptersTest) {
+      component.inject(test)
+    }
+
+    override fun createActivityComponent(activity: AppCompatActivity): ActivityComponent {
+      return component.getActivityComponentBuilderProvider().get().setActivity(activity).build()
+    }
+
+    override fun getApplicationInjector(): ApplicationInjector = component
+  }
+}
diff --git a/data/src/main/java/org/oppia/android/data/persistence/BUILD.bazel b/data/src/main/java/org/oppia/android/data/persistence/BUILD.bazel
index db67d9fb798..2137ddc1f86 100644
--- a/data/src/main/java/org/oppia/android/data/persistence/BUILD.bazel
+++ b/data/src/main/java/org/oppia/android/data/persistence/BUILD.bazel
@@ -13,7 +13,7 @@ kt_android_library(
     deps = [
         ":dagger",
         "//model/src/main/proto:profile_java_proto_lite",
-        "//utility",
+        "//third_party:androidx_annotation_annotation",
         "//utility/src/main/java/org/oppia/android/util/data:async_data_subscription_manager",
         "//utility/src/main/java/org/oppia/android/util/data:async_result",
         "//utility/src/main/java/org/oppia/android/util/data:data_provider",
diff --git a/data/src/main/java/org/oppia/android/data/persistence/PersistentCacheStore.kt b/data/src/main/java/org/oppia/android/data/persistence/PersistentCacheStore.kt
index e7c081e6834..ba97ab106b6 100644
--- a/data/src/main/java/org/oppia/android/data/persistence/PersistentCacheStore.kt
+++ b/data/src/main/java/org/oppia/android/data/persistence/PersistentCacheStore.kt
@@ -272,6 +272,12 @@ class PersistentCacheStore<T : MessageLite> private constructor(
       return currentPayload.copy(state = CacheState.IN_MEMORY_ONLY)
     }
 
+    // It's possible for multiple load requests to happen simultaneously, but finish out of order.
+    // Attempting to load the cache a second time can result in a number of problems:
+    // - Losing in-memory cache state.
+    // - Duplicating loaded on-disk state (since "mergeFrom()" is used for loading).
+    if (currentPayload.state != CacheState.UNLOADED) return currentPayload
+
     val cacheBuilder = currentPayload.value.toBuilder()
     return try {
       currentPayload.copy(
diff --git a/data/src/test/java/org/oppia/android/data/persistence/PersistentCacheStoreTest.kt b/data/src/test/java/org/oppia/android/data/persistence/PersistentCacheStoreTest.kt
index 6143cf71b39..d655e11bcb9 100644
--- a/data/src/test/java/org/oppia/android/data/persistence/PersistentCacheStoreTest.kt
+++ b/data/src/test/java/org/oppia/android/data/persistence/PersistentCacheStoreTest.kt
@@ -14,7 +14,7 @@ import dagger.Provides
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Deferred
-import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.asCoroutineDispatcher
 import kotlinx.coroutines.async
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -37,6 +37,7 @@ import org.oppia.android.testing.TestLogReportingModule
 import org.oppia.android.testing.data.AsyncResultSubject.Companion.assertThat
 import org.oppia.android.testing.data.DataProviderTestMonitor
 import org.oppia.android.testing.robolectric.RobolectricModule
+import org.oppia.android.testing.threading.TestCoroutineDispatcher
 import org.oppia.android.testing.threading.TestCoroutineDispatchers
 import org.oppia.android.testing.threading.TestDispatcherModule
 import org.oppia.android.util.data.AsyncDataSubscriptionManager
@@ -53,6 +54,7 @@ import java.io.FileInputStream
 import java.io.FileOutputStream
 import java.io.IOException
 import java.lang.IllegalStateException
+import java.util.concurrent.Executors
 import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.reflect.full.staticFunctions
@@ -101,8 +103,18 @@ class PersistentCacheStoreTest {
   @Inject lateinit var monitorFactory: DataProviderTestMonitor.Factory
   @Inject lateinit var asyncDataSubscriptionManager: AsyncDataSubscriptionManager
   @Mock lateinit var mockSubscriptionCallback: SubscriptionCallback
+  @Inject lateinit var testCoroutineDispatcherFactory: TestCoroutineDispatcher.Factory
 
   private val backgroundDispatcherScope by lazy { CoroutineScope(backgroundDispatcher) }
+  private val testOnlyBlockingDispatcher by lazy {
+    Executors.newSingleThreadExecutor().asCoroutineDispatcher()
+  }
+  private val testOnlyBlockingTestDispatcher by lazy {
+    testCoroutineDispatcherFactory.createDispatcher(testOnlyBlockingDispatcher)
+  }
+  private val testOnlyBlockingDispatcherScope by lazy {
+    CoroutineScope(testOnlyBlockingTestDispatcher)
+  }
 
   @Before
   fun setUp() {
@@ -112,7 +124,6 @@ class PersistentCacheStoreTest {
   // TODO(#59): Create a test-only proto for this test rather than needing to reuse a
   //  production-facing proto.
   @Test
-  @ExperimentalCoroutinesApi
   fun testCache_initialState_isPending() {
     val cacheStore = cacheFactory.create(CACHE_NAME_1, TestMessage.getDefaultInstance())
 
@@ -123,12 +134,11 @@ class PersistentCacheStoreTest {
     // state, yet the pending state is really likely to be observed in production situations. The
     // timing model in tests is a bit too different from production to properly simulate this case.
     // This seems like a reasonable workaround to verify the same effective behavior.
-    val deferredResult = backgroundDispatcherScope.async {
-      cacheStore.retrieveData()
-    }
-    testCoroutineDispatchers.advanceUntilIdle()
+    val deferredResult = backgroundDispatcherScope.async { cacheStore.retrieveData() }
+    val deferredStateFlow = deferredResult.toStateFlow()
+    testCoroutineDispatchers.runCurrent()
 
-    assertThat(deferredResult.getCompleted()).isPending()
+    assertThat(deferredStateFlow.flattenDeferredResult()).isPending()
   }
 
   @Test
@@ -1478,7 +1488,7 @@ class PersistentCacheStoreTest {
     )
     cacheStore.storeDataAsync {
       it.toBuilder().apply { strValue = "different update" }.build()
-    }.waitForResult()
+    }.waitForSuccessfulResult()
 
     val deferred =
       cacheStore.primeInMemoryAndDiskCacheAsync(
@@ -1502,7 +1512,7 @@ class PersistentCacheStoreTest {
     )
     cacheStore.storeDataAsync {
       it.toBuilder().apply { strValue = "different update" }.build()
-    }.waitForResult()
+    }.waitForSuccessfulResult()
 
     val deferred =
       cacheStore.primeInMemoryAndDiskCacheAsync(
@@ -1544,6 +1554,34 @@ class PersistentCacheStoreTest {
     assertThat(onDiskValue.strValue).isEqualTo("different initial first transform")
   }
 
+  @Test
+  @Suppress("DeferredResultUnused") // The result of the test implies the deferred ops' results.
+  fun testLoadFileCacheFromDisk_multipleTimesInTandem_onlyLoadsOnce() {
+    writeFileCache(
+      CACHE_NAME_1,
+      TestMessage.newBuilder().apply {
+        addStrValues("one")
+        addStrValues("two")
+      }.build()
+    )
+    val cacheStore = cacheFactory.create(CACHE_NAME_1, TestMessage.getDefaultInstance())
+
+    // Perform two operations on an initial factory that can trigger deferred loading. Note that the
+    // order matters here due to implementation details: certain initial read sequences can result
+    // in multiple attempts to load the on-disk file without additional filtering being implemented
+    // (which is what this test is verifying is present in the implementation). Note also that these
+    // operations are occurring on a separate blocking thread to ensure they occur in order and do
+    // not contend with the blocking dispatcher that's used by the cache's implementation.
+    testOnlyBlockingDispatcherScope.async { cacheStore.retrieveData() }
+    testOnlyBlockingDispatcherScope.async { cacheStore.readDataAsync().await() }
+    testOnlyBlockingDispatcherScope.async { cacheStore.retrieveData() }
+    testOnlyBlockingTestDispatcher.runCurrentCoordinated()
+
+    // Only 2 values should be in the list if it wasn't duplicated during reading setup.
+    val currentCacheState = monitorFactory.waitForNextSuccessfulResult(cacheStore)
+    assertThat(currentCacheState.strValuesList).hasSize(2)
+  }
+
   private fun <T : MessageLite> subscribeToCacheStoreChanges(cacheStore: PersistentCacheStore<T>) {
     asyncDataSubscriptionManager.subscribe(
       cacheStore.getId(), mockSubscriptionCallback.toAsyncChange()
@@ -1609,15 +1647,7 @@ class PersistentCacheStoreTest {
     } as T
   }
 
-  private fun <T> Deferred<T>.waitForSuccessfulResult() {
-    return when (val result = waitForResult()) {
-      is AsyncResult.Pending -> error("Deferred never finished.")
-      is AsyncResult.Success -> {} // Nothing to do; the result succeeded.
-      is AsyncResult.Failure -> throw IllegalStateException("Deferred failed", result.error)
-    }
-  }
-
-  private fun <T> Deferred<T>.waitForResult() = toStateFlow().waitForLatestValue()
+  private fun <T> Deferred<T>.waitForSuccessfulResult() = toStateFlow().waitForLatestValue()
 
   private fun <T> Deferred<T>.toStateFlow(): StateFlow<AsyncResult<T>> {
     val deferred = this
@@ -1630,8 +1660,26 @@ class PersistentCacheStoreTest {
     }
   }
 
-  private fun <T> StateFlow<T>.waitForLatestValue(): T =
-    also { testCoroutineDispatchers.runCurrent() }.value
+  private fun <T> StateFlow<AsyncResult<T>>.flattenDeferredResult(): T {
+    return when (val asyncResult = value) {
+      is AsyncResult.Pending -> error("Deferred never finished.")
+      is AsyncResult.Success -> asyncResult.value
+      is AsyncResult.Failure -> throw IllegalStateException("Deferred failed", asyncResult.error)
+    }
+  }
+
+  private fun <T> StateFlow<AsyncResult<T>>.waitForLatestValue(): T =
+    also { testCoroutineDispatchers.runCurrent() }.flattenDeferredResult()
+
+  private fun TestCoroutineDispatcher.runCurrentCoordinated() {
+    // This logic is based on TestCoroutineDispatchersRobolectricImpl.runCurrent. It's necessary
+    // logic in this suite since some tests require syncing a test coroutine dispatcher that may
+    // depend on the broader shared dispatchers.
+    do {
+      runCurrent()
+      testCoroutineDispatchers.runCurrent()
+    } while (hasPendingCompletableTasks())
+  }
 
   private fun setUpTestApplicationComponent() {
     ApplicationProvider.getApplicationContext<TestApplication>().inject(this)
diff --git a/domain/BUILD.bazel b/domain/BUILD.bazel
index cbe7711792a..0ed3083821d 100755
--- a/domain/BUILD.bazel
+++ b/domain/BUILD.bazel
@@ -216,8 +216,8 @@ TEST_DEPS = [
     "//testing/src/main/java/org/oppia/android/testing/data:async_result_subject",
     "//testing/src/main/java/org/oppia/android/testing/data:data_provider_test_monitor",
     "//testing/src/main/java/org/oppia/android/testing/logging:event_log_subject",
-    "//testing/src/main/java/org/oppia/android/testing/logging:fake_sync_status_manager",
     "//testing/src/main/java/org/oppia/android/testing/logging:sync_status_test_module",
+    "//testing/src/main/java/org/oppia/android/testing/logging:test_sync_status_manager",
     "//testing/src/main/java/org/oppia/android/testing/network:network",
     "//testing/src/main/java/org/oppia/android/testing/network:test_module",
     "//testing/src/main/java/org/oppia/android/testing/platformparameter:test_module",
diff --git a/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsController.kt b/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsController.kt
index 4f5ab532094..7b01f402e8b 100644
--- a/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsController.kt
+++ b/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsController.kt
@@ -2,16 +2,29 @@ package org.oppia.android.domain.oppialogger.analytics
 
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.async
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.emitAll
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onCompletion
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.transform
 import org.oppia.android.app.model.EventLog
 import org.oppia.android.app.model.EventLog.Priority
 import org.oppia.android.app.model.OppiaEventLogs
 import org.oppia.android.app.model.ProfileId
 import org.oppia.android.data.persistence.PersistentCacheStore
+import org.oppia.android.data.persistence.PersistentCacheStore.PublishMode.PUBLISH_TO_IN_MEMORY_CACHE
+import org.oppia.android.data.persistence.PersistentCacheStore.UpdateMode.UPDATE_IF_NEW_CACHE
 import org.oppia.android.domain.oppialogger.EventLogStorageCacheSize
 import org.oppia.android.domain.translation.TranslationController
 import org.oppia.android.util.data.AsyncResult
 import org.oppia.android.util.data.DataProvider
+import org.oppia.android.util.data.DataProviders
 import org.oppia.android.util.logging.AnalyticsEventLogger
 import org.oppia.android.util.logging.ConsoleLogger
 import org.oppia.android.util.logging.ExceptionLogger
@@ -19,9 +32,13 @@ import org.oppia.android.util.logging.SyncStatusManager
 import org.oppia.android.util.networking.NetworkConnectionUtil
 import org.oppia.android.util.networking.NetworkConnectionUtil.ProdConnectionStatus.NONE
 import org.oppia.android.util.system.OppiaClock
+import org.oppia.android.util.threading.BackgroundDispatcher
 import org.oppia.android.util.threading.BlockingDispatcher
-import java.lang.IllegalStateException
+import java.util.concurrent.atomic.AtomicInteger
 import javax.inject.Inject
+import javax.inject.Singleton
+
+private const val UPLOAD_ALL_EVENTS_PROVIDER_ID = "AnalyticsController.upload_all_events"
 
 /**
  * Controller for handling analytics event logging.
@@ -29,6 +46,7 @@ import javax.inject.Inject
  * Callers should not use this class directly; instead, they should use ``OppiaLogger`` which
  * provides convenience log methods.
  */
+@Singleton
 class AnalyticsController @Inject constructor(
   private val analyticsEventLogger: AnalyticsEventLogger,
   cacheStoreFactory: PersistentCacheStore.Factory,
@@ -38,11 +56,26 @@ class AnalyticsController @Inject constructor(
   private val syncStatusManager: SyncStatusManager,
   private val oppiaClock: OppiaClock,
   private val translationController: TranslationController,
+  private val dataProviders: DataProviders,
   @EventLogStorageCacheSize private val eventLogStorageCacheSize: Int,
-  @BlockingDispatcher private val blockingDispatcher: CoroutineDispatcher
+  @BlockingDispatcher private val blockingDispatcher: CoroutineDispatcher,
+  @BackgroundDispatcher private val backgroundDispatcher: CoroutineDispatcher
 ) {
+  // NOTE TO DEVELOPER: This log store should not be lazy since it needs to be primed as early as
+  // possible. When this is created shouldn't affect event record integrity, but it can affect how
+  // the sync status manager reports progress since it won't have a data source to properly monitor
+  // for changes.
   private val eventLogStore =
-    cacheStoreFactory.create("event_logs", OppiaEventLogs.getDefaultInstance())
+    cacheStoreFactory.create("event_logs", OppiaEventLogs.getDefaultInstance()).also { store ->
+      store.primeInMemoryAndDiskCacheAsync(
+        UPDATE_IF_NEW_CACHE, PUBLISH_TO_IN_MEMORY_CACHE
+      ).invokeOnCompletion { error ->
+        error?.let {
+          consoleLogger.e("AnalyticsController", "Failed to prime event log cache.", error)
+        }
+      }
+      syncStatusManager.initializeEventLogStore(store)
+    }
 
   /**
    * Logs a high priority event defined by [eventContext] corresponding to time [timestamp].
@@ -58,17 +91,7 @@ class AnalyticsController @Inject constructor(
     profileId: ProfileId?,
     timestamp: Long = oppiaClock.getCurrentTimeMs()
   ) {
-    CoroutineScope(blockingDispatcher).async {
-      uploadOrCacheEventLog(createEventLog(profileId, timestamp, eventContext, Priority.ESSENTIAL))
-    }.invokeOnCompletion { failure ->
-      failure?.let {
-        consoleLogger.e(
-          "AnalyticsController",
-          "Failed to upload or cache important event: $eventContext (at time $timestamp).",
-          it
-        )
-      }
-    }
+    logEvent(eventContext, profileId, priority = Priority.ESSENTIAL, timestamp)
   }
 
   /**
@@ -88,14 +111,23 @@ class AnalyticsController @Inject constructor(
     eventContext: EventLog.Context,
     profileId: ProfileId?,
     timestamp: Long = oppiaClock.getCurrentTimeMs()
+  ) {
+    logEvent(eventContext, profileId, priority = Priority.OPTIONAL, timestamp)
+  }
+
+  private fun logEvent(
+    eventContext: EventLog.Context,
+    profileId: ProfileId?,
+    priority: Priority,
+    timestamp: Long
   ) {
     CoroutineScope(blockingDispatcher).async {
-      uploadOrCacheEventLog(createEventLog(profileId, timestamp, eventContext, Priority.OPTIONAL))
+      uploadOrCacheEventLog(createEventLog(profileId, timestamp, eventContext, priority))
     }.invokeOnCompletion { failure ->
       failure?.let {
         consoleLogger.w(
           "AnalyticsController",
-          "Failed to upload or cache low-priority event: $eventContext (at time $timestamp).",
+          "Failed to upload or cache $priority event: $eventContext (at time $timestamp).",
           it
         )
       }
@@ -113,6 +145,7 @@ class AnalyticsController @Inject constructor(
       this.timestamp = timestamp
       this.priority = priority
       this.context = context
+      profileId?.let { this.profileId = it }
       resolveProfileOperation(
         profileId, translationController::getAppLanguageSelection
       )?.let { this.appLanguageSelection = it }
@@ -128,14 +161,10 @@ class AnalyticsController @Inject constructor(
   /** Either uploads or caches [eventLog] depending on current internet connectivity. */
   private suspend fun uploadOrCacheEventLog(eventLog: EventLog) {
     when (networkConnectionUtil.getCurrentConnectionStatus()) {
-      NONE -> {
-        syncStatusManager.setSyncStatus(SyncStatusManager.SyncStatus.NO_CONNECTIVITY)
-        cacheEventLog(eventLog)
-      }
+      NONE -> cacheEventLog(eventLog)
       else -> {
-        syncStatusManager.setSyncStatus(SyncStatusManager.SyncStatus.DATA_UPLOADING)
         analyticsEventLogger.logEvent(eventLog)
-        syncStatusManager.setSyncStatus(SyncStatusManager.SyncStatus.DATA_UPLOADED)
+        recordUploadedEvent(eventLog)
       }
     }
   }
@@ -149,13 +178,13 @@ class AnalyticsController @Inject constructor(
    */
   private suspend fun cacheEventLog(eventLog: EventLog) {
     eventLogStore.storeDataAsync(updateInMemoryCache = true) { oppiaEventLogs ->
-      val storeSize = oppiaEventLogs.eventLogList.size
+      val storeSize = oppiaEventLogs.eventLogsToUploadList.size
       if (storeSize + 1 > eventLogStorageCacheSize) {
         val eventLogRemovalIndex = getLeastRecentEventIndex(oppiaEventLogs)
         if (eventLogRemovalIndex != null) {
           return@storeDataAsync oppiaEventLogs.toBuilder()
-            .removeEventLog(eventLogRemovalIndex)
-            .addEventLog(eventLog)
+            .removeEventLogsToUpload(eventLogRemovalIndex)
+            .addEventLogsToUpload(eventLog)
             .build()
         } else {
           // TODO(#1433): Refactoring for logging exceptions to both console and exception loggers.
@@ -165,7 +194,13 @@ class AnalyticsController @Inject constructor(
           exceptionLogger.logException(exception)
         }
       }
-      return@storeDataAsync oppiaEventLogs.toBuilder().addEventLog(eventLog).build()
+      return@storeDataAsync oppiaEventLogs.toBuilder().addEventLogsToUpload(eventLog).build()
+    }.await()
+  }
+
+  private suspend fun recordUploadedEvent(eventLog: EventLog) {
+    eventLogStore.storeDataAsync(updateInMemoryCache = true) { oppiaEventLogs ->
+      oppiaEventLogs.toBuilder().addUploadedEventLogs(eventLog).build()
     }.await()
   }
 
@@ -177,47 +212,119 @@ class AnalyticsController @Inject constructor(
    * returns null, then the index of the least recent event regardless of the priority is returned.
    */
   private fun getLeastRecentEventIndex(oppiaEventLogs: OppiaEventLogs): Int? =
-    oppiaEventLogs.eventLogList.withIndex()
+    oppiaEventLogs.eventLogsToUploadList.withIndex()
       .filter { it.value.priority == Priority.OPTIONAL }
       .minByOrNull { it.value.timestamp }?.index ?: getLeastRecentGeneralEventIndex(oppiaEventLogs)
 
   /** Returns the index of the least recent event regardless of their priority. */
   private fun getLeastRecentGeneralEventIndex(oppiaEventLogs: OppiaEventLogs): Int? =
-    oppiaEventLogs.eventLogList.withIndex()
-      .minByOrNull { it.value.timestamp }?.index
+    oppiaEventLogs.eventLogsToUploadList.withIndex().minByOrNull { it.value.timestamp }?.index
 
   /** Returns a data provider for log reports that have been recorded for upload. */
-  fun getEventLogStore(): DataProvider<OppiaEventLogs> {
-    return eventLogStore
+  fun getEventLogStore(): DataProvider<OppiaEventLogs> = eventLogStore
+
+  /**
+   * Uploads all events pending currently for upload, and blocks until the events are uploaded. An
+   * error will be thrown if something went wrong during upload.
+   *
+   * This should be used in cases when the caller needs to pause all of its execution until the
+   * events are guaranteed to synchronously be uploaded, unlike [uploadEventLogs] which can be used
+   * from a UI caller to track the upload operation asynchronously.
+   *
+   * [SyncStatusManager] can be used to observe the start & stop moments of event uploading.
+   */
+  suspend fun uploadEventLogsAndWait() {
+    val uploadResult = uploadAllEvents().lastOrNull()
+    if (uploadResult is AsyncResult.Failure) throw uploadResult.error
   }
 
   /**
-   * Returns a list of event log reports that have been recorded for upload.
+   * Uploads all events pending currently for upload, and returns a [DataProvider] to track the
+   * results.
    *
-   * As we are using the await call on the deferred output of readDataAsync, the failure case would
-   * be caught and it'll throw an error.
+   * Note that the returned data provider will initially provide a pending result, but then will
+   * update with one or more [Pair]s with a [Pair.first] value of the current number of uploaded
+   * events and a [Pair.second] value of the total number of events to upload. The operation can be
+   * assumed that it's not completed until these two values are equal (and, per eventual
+   * consistency, it's guaranteed that there will be no follow-up changes to the provider).
+   *
+   * Unlike [uploadEventLogsAndWait], this can be called asynchronously and observed in a UI. This
+   * otherwise follows the same sync status update behaviors as [uploadEventLogsAndWait].
    */
-  suspend fun getEventLogStoreList(): MutableList<EventLog> {
-    return eventLogStore.readDataAsync().await().eventLogList
+  fun uploadEventLogs(): DataProvider<Pair<Int, Int>> {
+    return dataProviders.run {
+      // stateIn() produces a hot flow that never completes. This is fine for DataProviders, but
+      // doesn't work for synchronous operations (like in uploadEventLogsAndWait).
+      uploadAllEvents().stateIn(
+        CoroutineScope(backgroundDispatcher),
+        SharingStarted.Lazily,
+        initialValue = AsyncResult.Pending()
+      ).convertAsyncToAutomaticDataProvider(UPLOAD_ALL_EVENTS_PROVIDER_ID)
+    }
   }
 
-  /** Removes the first event log report that had been recorded for upload. */
-  fun removeFirstEventLogFromStore() {
-    eventLogStore.storeDataAsync(updateInMemoryCache = true) { oppiaEventLogs ->
-      return@storeDataAsync oppiaEventLogs.toBuilder().removeEventLog(0).build()
-    }.invokeOnCompletion {
-      it?.let { consoleLogger.e("AnalyticsController", "Failed to remove event log.", it) }
+  private fun uploadAllEvents(): Flow<AsyncResult<Pair<Int, Int>>> {
+    val completedEventCount = AtomicInteger()
+    syncStatusManager.reportUploadingStarted()
+    return retrieveEventLogCountAsync().transform { eventLogCount ->
+      // Values are emitted in any order of completion (since N operations of "remove first" should
+      // ensure that all logs are uploaded, and roughly in order).
+      when (eventLogCount) {
+        0 -> emit(AsyncResult.Success(0 to 0))
+        else -> repeat(eventLogCount) {
+          emitAll(
+            logFirstEventLogFromStoreAsync().map {
+              AsyncResult.Success(completedEventCount.incrementAndGet() to eventLogCount)
+            }
+          )
+        }
+      }
+    }.onCompletion {
+      // Only consider uploading successfully completed if nothing went wrong during upload.
+      if (it == null) syncStatusManager.reportUploadingEnded()
     }
   }
 
+  private fun retrieveEventLogCountAsync(): Flow<Int> =
+    flow { emit(eventLogStore.readDataAsync().await().eventLogsToUploadCount) }
+
+  private fun logFirstEventLogFromStoreAsync(): Flow<Unit> {
+    return flow {
+      check(networkConnectionUtil.getCurrentConnectionStatus() != NONE) {
+        "Cannot upload events without internet connectivity."
+      }
+      emit(analyticsEventLogger.logEvent(removeFirstEventLogFromStoreAsync().await()))
+    }
+  }
+
+  private fun removeFirstEventLogFromStoreAsync(): Deferred<EventLog> {
+    return eventLogStore.storeDataWithCustomChannelAsync(updateInMemoryCache = true) { eventLogs ->
+      eventLogs.toBuilder().apply {
+        addUploadedEventLogs(eventLogs.eventLogsToUploadList.first())
+        removeEventLogsToUpload(0)
+      }.build() to eventLogs.eventLogsToUploadList.first()
+    }.also {
+      it.invokeOnCompletion { error ->
+        error?.let { consoleLogger.e("AnalyticsController", "Failed to remove event log.", error) }
+      }
+    }
+  }
+
+  // TODO(#4119): Migrate this to Flow.lastOrNull() once Kotlin 1.5 is available.
+  private suspend fun <T : Any> Flow<T>.lastOrNull(): T? {
+    return CoroutineScope(backgroundDispatcher).async {
+      var lastValue: T? = null
+      this@lastOrNull.collect {
+        lastValue = it
+      }
+      return@async lastValue
+    }.await()
+  }
+
   private companion object {
     private suspend fun <T> resolveProfileOperation(
       profileId: ProfileId?,
       createProvider: (ProfileId) -> DataProvider<T>
-    ): T? {
-      return profileId?.let {
-        (createProvider(it).retrieveData() as? AsyncResult.Success<T>)?.value
-      }
-    }
+    ): T? = profileId?.let { (createProvider(it).retrieveData() as? AsyncResult.Success<T>)?.value }
   }
 }
diff --git a/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel
index 98355aab203..1c486e0f10c 100644
--- a/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel
+++ b/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel
@@ -32,6 +32,7 @@ kt_android_library(
         "//utility/src/main/java/org/oppia/android/util/logging:console_logger",
         "//utility/src/main/java/org/oppia/android/util/logging:event_logger",
         "//utility/src/main/java/org/oppia/android/util/logging:exception_logger",
+        "//utility/src/main/java/org/oppia/android/util/logging:sync_status_manager",
         "//utility/src/main/java/org/oppia/android/util/networking:network_connection_util",
     ],
 )
@@ -85,6 +86,7 @@ kt_android_library(
         "//domain/src/main/java/org/oppia/android/domain/oppialogger:oppia_logger",
         "//domain/src/main/java/org/oppia/android/domain/oppialogger:startup_listener",
         "//model/src/main/proto:performance_metrics_event_logger_java_proto_lite",
+        "//utility",
         "//utility/src/main/java/org/oppia/android/util/logging/performancemetrics:performance_metrics_assessor",
         "//utility/src/main/java/org/oppia/android/util/logging/performancemetrics:performance_metrics_event_logger",
     ],
diff --git a/domain/src/main/java/org/oppia/android/domain/oppialogger/loguploader/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/oppialogger/loguploader/BUILD.bazel
index 36a17c0f003..ac5d1338364 100644
--- a/domain/src/main/java/org/oppia/android/domain/oppialogger/loguploader/BUILD.bazel
+++ b/domain/src/main/java/org/oppia/android/domain/oppialogger/loguploader/BUILD.bazel
@@ -10,6 +10,9 @@ kt_android_library(
     srcs = [
         "LogReportWorkManagerInitializer.kt",
     ],
+    visibility = [
+        "//domain:domain_testing_visibility",
+    ],
     deps = [
         ":worker",
         "//domain/src/main/java/org/oppia/android/domain/oppialogger:startup_listener",
@@ -26,12 +29,16 @@ kt_android_library(
     srcs = [
         "LogUploadWorker.kt",
     ],
+    visibility = [
+        "//domain:domain_testing_visibility",
+    ],
     deps = [
         "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:controller",
         "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:performance_metrics_controller",
         "//domain/src/main/java/org/oppia/android/domain/oppialogger/exceptions:controller",
         "//domain/src/main/java/org/oppia/android/domain/util:extensions",
         "//third_party:androidx_work_work-runtime-ktx",
+        "//third_party:com_google_guava_guava",
         "//utility/src/main/java/org/oppia/android/util/logging:console_logger",
         "//utility/src/main/java/org/oppia/android/util/logging:event_logger",
         "//utility/src/main/java/org/oppia/android/util/logging:exception_logger",
diff --git a/domain/src/main/java/org/oppia/android/domain/oppialogger/loguploader/LogUploadWorker.kt b/domain/src/main/java/org/oppia/android/domain/oppialogger/loguploader/LogUploadWorker.kt
index 7ea28a898ad..ed860470f56 100644
--- a/domain/src/main/java/org/oppia/android/domain/oppialogger/loguploader/LogUploadWorker.kt
+++ b/domain/src/main/java/org/oppia/android/domain/oppialogger/loguploader/LogUploadWorker.kt
@@ -14,7 +14,6 @@ import org.oppia.android.domain.oppialogger.analytics.PerformanceMetricsControll
 import org.oppia.android.domain.oppialogger.exceptions.ExceptionsController
 import org.oppia.android.domain.oppialogger.exceptions.toException
 import org.oppia.android.domain.util.getStringFromData
-import org.oppia.android.util.logging.AnalyticsEventLogger
 import org.oppia.android.util.logging.ConsoleLogger
 import org.oppia.android.util.logging.ExceptionLogger
 import org.oppia.android.util.logging.SyncStatusManager
@@ -30,7 +29,6 @@ class LogUploadWorker private constructor(
   private val exceptionsController: ExceptionsController,
   private val performanceMetricsController: PerformanceMetricsController,
   private val exceptionLogger: ExceptionLogger,
-  private val analyticsEventLogger: AnalyticsEventLogger,
   private val performanceMetricsEventLogger: PerformanceMetricsEventLogger,
   private val consoleLogger: ConsoleLogger,
   private val syncStatusManager: SyncStatusManager,
@@ -89,15 +87,10 @@ class LogUploadWorker private constructor(
   /** Extracts event logs from the cache store and logs them to the remote service. */
   private suspend fun uploadEvents(): Result {
     return try {
-      syncStatusManager.setSyncStatus(SyncStatusManager.SyncStatus.DATA_UPLOADING)
-      analyticsController.getEventLogStoreList().forEach { eventLog ->
-        analyticsEventLogger.logEvent(eventLog)
-        analyticsController.removeFirstEventLogFromStore()
-      }
-      syncStatusManager.setSyncStatus(SyncStatusManager.SyncStatus.DATA_UPLOADED)
+      analyticsController.uploadEventLogsAndWait()
       Result.success()
     } catch (e: Exception) {
-      syncStatusManager.setSyncStatus(SyncStatusManager.SyncStatus.NETWORK_ERROR)
+      syncStatusManager.reportUploadError()
       consoleLogger.e(TAG, "Failed to upload events", e)
       Result.failure()
     }
@@ -124,13 +117,11 @@ class LogUploadWorker private constructor(
     private val exceptionsController: ExceptionsController,
     private val performanceMetricsController: PerformanceMetricsController,
     private val exceptionLogger: ExceptionLogger,
-    private val analyticsEventLogger: AnalyticsEventLogger,
     private val performanceMetricsEventLogger: PerformanceMetricsEventLogger,
     private val consoleLogger: ConsoleLogger,
     private val syncStatusManager: SyncStatusManager,
     @BackgroundDispatcher private val backgroundDispatcher: CoroutineDispatcher
   ) {
-
     fun create(context: Context, params: WorkerParameters): ListenableWorker {
       return LogUploadWorker(
         context,
@@ -139,7 +130,6 @@ class LogUploadWorker private constructor(
         exceptionsController,
         performanceMetricsController,
         exceptionLogger,
-        analyticsEventLogger,
         performanceMetricsEventLogger,
         consoleLogger,
         syncStatusManager,
diff --git a/domain/src/main/java/org/oppia/android/domain/profile/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/profile/BUILD.bazel
index c3cf010ddd9..559ed5175d5 100644
--- a/domain/src/main/java/org/oppia/android/domain/profile/BUILD.bazel
+++ b/domain/src/main/java/org/oppia/android/domain/profile/BUILD.bazel
@@ -19,6 +19,7 @@ kt_android_library(
         "//domain/src/main/java/org/oppia/android/domain/oppialogger/exceptions:controller",
         "//model/src/main/proto:profile_java_proto_lite",
         "//third_party:javax_inject_javax_inject",
+        "//utility",
         "//utility/src/main/java/org/oppia/android/util/data:async_result",
         "//utility/src/main/java/org/oppia/android/util/data:data_provider",
         "//utility/src/main/java/org/oppia/android/util/data:data_providers",
diff --git a/domain/src/test/java/org/oppia/android/domain/clipboard/BUILD.bazel b/domain/src/test/java/org/oppia/android/domain/clipboard/BUILD.bazel
index 29840326197..6d6534cf9bf 100644
--- a/domain/src/test/java/org/oppia/android/domain/clipboard/BUILD.bazel
+++ b/domain/src/test/java/org/oppia/android/domain/clipboard/BUILD.bazel
@@ -17,8 +17,8 @@ oppia_android_test(
         "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:prod_module",
         "//testing",
         "//testing/src/main/java/org/oppia/android/testing/data:data_provider_test_monitor",
-        "//testing/src/main/java/org/oppia/android/testing/logging:fake_sync_status_manager",
         "//testing/src/main/java/org/oppia/android/testing/logging:sync_status_test_module",
+        "//testing/src/main/java/org/oppia/android/testing/logging:test_sync_status_manager",
         "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module",
         "//testing/src/main/java/org/oppia/android/testing/threading:test_coroutine_dispatchers",
         "//testing/src/main/java/org/oppia/android/testing/threading:test_module",
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 2cf71bad6f3..34d0947f39b 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
@@ -9,17 +9,27 @@ import dagger.BindsInstance
 import dagger.Component
 import dagger.Module
 import dagger.Provides
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.async
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import org.junit.Assert.fail
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.oppia.android.app.model.AppLanguageSelection
 import org.oppia.android.app.model.AudioTranslationLanguageSelection
+import org.oppia.android.app.model.EventLog
+import org.oppia.android.app.model.OppiaEventLogs
 import org.oppia.android.app.model.OppiaLanguage
 import org.oppia.android.app.model.OppiaLanguage.ENGLISH
 import org.oppia.android.app.model.OppiaLanguage.HINGLISH
 import org.oppia.android.app.model.OppiaLanguage.SWAHILI
 import org.oppia.android.app.model.ProfileId
 import org.oppia.android.app.model.WrittenTranslationLanguageSelection
+import org.oppia.android.data.persistence.PersistentCacheStore
 import org.oppia.android.domain.oppialogger.EventLogStorageCacheSize
 import org.oppia.android.domain.oppialogger.ExceptionLogStorageCacheSize
 import org.oppia.android.domain.oppialogger.LoggingIdentifierModule
@@ -31,15 +41,17 @@ import org.oppia.android.domain.profile.ProfileManagementController
 import org.oppia.android.domain.translation.TranslationController
 import org.oppia.android.testing.FakeAnalyticsEventLogger
 import org.oppia.android.testing.TestLogReportingModule
+import org.oppia.android.testing.data.AsyncResultSubject.Companion.assertThat
 import org.oppia.android.testing.data.DataProviderTestMonitor
 import org.oppia.android.testing.logging.EventLogSubject.Companion.assertThat
-import org.oppia.android.testing.logging.FakeSyncStatusManager
 import org.oppia.android.testing.logging.SyncStatusTestModule
+import org.oppia.android.testing.logging.TestSyncStatusManager
 import org.oppia.android.testing.robolectric.RobolectricModule
 import org.oppia.android.testing.threading.TestCoroutineDispatchers
 import org.oppia.android.testing.threading.TestDispatcherModule
 import org.oppia.android.testing.time.FakeOppiaClockModule
 import org.oppia.android.util.caching.AssetModule
+import org.oppia.android.util.data.AsyncResult
 import org.oppia.android.util.data.DataProviders
 import org.oppia.android.util.data.DataProvidersInjector
 import org.oppia.android.util.data.DataProvidersInjectorProvider
@@ -50,13 +62,19 @@ import org.oppia.android.util.logging.GlobalLogLevel
 import org.oppia.android.util.logging.LogLevel
 import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.DATA_UPLOADED
 import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.DATA_UPLOADING
+import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.INITIAL_UNKNOWN
 import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.NO_CONNECTIVITY
 import org.oppia.android.util.networking.NetworkConnectionDebugUtil
+import org.oppia.android.util.networking.NetworkConnectionUtil.ProdConnectionStatus.LOCAL
 import org.oppia.android.util.networking.NetworkConnectionUtil.ProdConnectionStatus.NONE
 import org.oppia.android.util.networking.NetworkConnectionUtilDebugModule
+import org.oppia.android.util.system.OppiaClock
+import org.oppia.android.util.threading.BackgroundDispatcher
 import org.robolectric.annotation.Config
 import org.robolectric.annotation.LooperMode
+import java.lang.IllegalStateException
 import javax.inject.Inject
+import javax.inject.Provider
 import javax.inject.Singleton
 
 private const val TEST_TIMESTAMP = 1556094120000
@@ -76,16 +94,24 @@ private const val TEST_SUB_TOPIC_ID = 1
 @LooperMode(LooperMode.Mode.PAUSED)
 @Config(application = AnalyticsControllerTest.TestApplication::class)
 class AnalyticsControllerTest {
-  @Inject lateinit var analyticsController: AnalyticsController
+  @Inject lateinit var analyticsControllerProvider: Provider<AnalyticsController>
   @Inject lateinit var oppiaLogger: OppiaLogger
   @Inject lateinit var networkConnectionUtil: NetworkConnectionDebugUtil
   @Inject lateinit var fakeAnalyticsEventLogger: FakeAnalyticsEventLogger
   @Inject lateinit var dataProviders: DataProviders
   @Inject lateinit var monitorFactory: DataProviderTestMonitor.Factory
-  @Inject lateinit var fakeSyncStatusManager: FakeSyncStatusManager
-  @Inject lateinit var profileManagementController: ProfileManagementController
+  @Inject lateinit var testSyncStatusManager: TestSyncStatusManager
+  @Inject lateinit var profileManagementControllerProvider: Provider<ProfileManagementController>
   @Inject lateinit var translationController: TranslationController
   @Inject lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
+  @Inject lateinit var oppiaClock: OppiaClock
+  @Inject lateinit var persistentCacheStoryFactory: PersistentCacheStore.Factory
+  @field:[Inject BackgroundDispatcher] lateinit var backgroundDispatcher: CoroutineDispatcher
+
+  // See testController_cachedEventsFromLastAppInstance_logNewEvent_thenForceSync_everythingUploads
+  // for an explanation of why these are provided via indirect injection.
+  private val profileManagementController by lazy { profileManagementControllerProvider.get() }
+  private val analyticsController by lazy { analyticsControllerProvider.get() }
 
   @Before
   fun setUp() {
@@ -298,6 +324,30 @@ class AnalyticsControllerTest {
       .isEqualTo(HINGLISH)
   }
 
+  @Test
+  fun testController_logImportantEvent_noProfile_hasNoProfileId() {
+    analyticsController.logImportantEvent(
+      oppiaLogger.createOpenConceptCardContext(TEST_SKILL_ID), profileId = null, TEST_TIMESTAMP
+    )
+    testCoroutineDispatchers.runCurrent()
+
+    val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
+    assertThat(eventLog.hasProfileId()).isFalse()
+  }
+
+  @Test
+  fun testController_logImportantEvent_withProfile_includesProfileId() {
+    val profileId = addNewProfileAndLogIn()
+    analyticsController.logImportantEvent(
+      oppiaLogger.createOpenConceptCardContext(TEST_SKILL_ID), profileId, TEST_TIMESTAMP
+    )
+    testCoroutineDispatchers.runCurrent()
+
+    val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
+    assertThat(eventLog.hasProfileId()).isTrue()
+    assertThat(eventLog).hasProfileIdThat().isEqualTo(profileId)
+  }
+
   @Test
   fun testController_logLowPriorityEvent_withQuestionContext_checkLogsEvent() {
     analyticsController.logLowPriorityEvent(
@@ -452,7 +502,8 @@ class AnalyticsControllerTest {
 
     val eventLogsProvider = analyticsController.getEventLogStore()
 
-    val eventLog = monitorFactory.waitForNextSuccessfulResult(eventLogsProvider).getEventLog(0)
+    val eventLog =
+      monitorFactory.waitForNextSuccessfulResult(eventLogsProvider).getEventLogsToUpload(0)
     assertThat(eventLog).hasTimestampThat().isEqualTo(TEST_TIMESTAMP)
     assertThat(eventLog).isEssentialPriority()
     assertThat(eventLog).hasOpenQuestionPlayerContext()
@@ -475,7 +526,8 @@ class AnalyticsControllerTest {
 
     val eventLogsProvider = analyticsController.getEventLogStore()
 
-    val eventLog = monitorFactory.waitForNextSuccessfulResult(eventLogsProvider).getEventLog(0)
+    val eventLog =
+      monitorFactory.waitForNextSuccessfulResult(eventLogsProvider).getEventLogsToUpload(0)
     assertThat(eventLog).hasTimestampThat().isEqualTo(TEST_TIMESTAMP)
     assertThat(eventLog).isOptionalPriority()
     assertThat(eventLog).hasOpenQuestionPlayerContext()
@@ -541,15 +593,40 @@ class AnalyticsControllerTest {
       .isEqualTo(HINGLISH)
   }
 
+  @Test
+  fun testController_logPriorityEvent_noProfile_hasNoProfileId() {
+    analyticsController.logLowPriorityEvent(
+      oppiaLogger.createOpenConceptCardContext(TEST_SKILL_ID), profileId = null, TEST_TIMESTAMP
+    )
+    testCoroutineDispatchers.runCurrent()
+
+    val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
+    assertThat(eventLog.hasProfileId()).isFalse()
+  }
+
+  @Test
+  fun testController_logPriorityEvent_withProfile_includesProfileId() {
+    val profileId = addNewProfileAndLogIn()
+    analyticsController.logLowPriorityEvent(
+      oppiaLogger.createOpenConceptCardContext(TEST_SKILL_ID), profileId, TEST_TIMESTAMP
+    )
+    testCoroutineDispatchers.runCurrent()
+
+    val eventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
+    assertThat(eventLog.hasProfileId()).isTrue()
+    assertThat(eventLog).hasProfileIdThat().isEqualTo(profileId)
+  }
+
   @Test
   fun testController_logImportantEvent_withNoNetwork_exceedLimit_checkEventLogStoreSize() {
     networkConnectionUtil.setCurrentConnectionStatus(NONE)
-    logMultipleEvents()
+    logFourEvents()
 
     val eventLogsProvider = analyticsController.getEventLogStore()
 
     val eventLogs = monitorFactory.waitForNextSuccessfulResult(eventLogsProvider)
-    assertThat(eventLogs.eventLogList).hasSize(2)
+    assertThat(eventLogs.eventLogsToUploadList).hasSize(2)
+    assertThat(eventLogs.uploadedEventLogsList).hasSize(0)
   }
 
   @Test
@@ -581,8 +658,8 @@ class AnalyticsControllerTest {
     val eventLogsProvider = analyticsController.getEventLogStore()
 
     val eventLogs = monitorFactory.waitForNextSuccessfulResult(eventLogsProvider)
-    val firstEventLog = eventLogs.getEventLog(0)
-    val secondEventLog = eventLogs.getEventLog(1)
+    val firstEventLog = eventLogs.getEventLogsToUpload(0)
+    val secondEventLog = eventLogs.getEventLogsToUpload(1)
 
     assertThat(firstEventLog).isOptionalPriority()
     assertThat(secondEventLog).isEssentialPriority()
@@ -617,7 +694,8 @@ class AnalyticsControllerTest {
     val logsProvider = analyticsController.getEventLogStore()
 
     val uploadedEventLog = fakeAnalyticsEventLogger.getMostRecentEvent()
-    val cachedEventLog = monitorFactory.waitForNextSuccessfulResult(logsProvider).getEventLog(0)
+    val cachedEventLog =
+      monitorFactory.waitForNextSuccessfulResult(logsProvider).getEventLogsToUpload(0)
 
     assertThat(uploadedEventLog).hasTimestampThat().isEqualTo(TEST_TIMESTAMP)
     assertThat(uploadedEventLog).isEssentialPriority()
@@ -631,14 +709,14 @@ class AnalyticsControllerTest {
   @Test
   fun testController_logEvents_exceedLimit_withNoNetwork_checkCorrectEventIsEvicted() {
     networkConnectionUtil.setCurrentConnectionStatus(NONE)
-    logMultipleEvents()
+    logFourEvents()
 
     val logsProvider = analyticsController.getEventLogStore()
 
     val eventLogs = monitorFactory.waitForNextSuccessfulResult(logsProvider)
-    val firstEventLog = eventLogs.getEventLog(0)
-    val secondEventLog = eventLogs.getEventLog(1)
-    assertThat(eventLogs.eventLogList).hasSize(2)
+    val firstEventLog = eventLogs.getEventLogsToUpload(0)
+    val secondEventLog = eventLogs.getEventLogsToUpload(1)
+    assertThat(eventLogs.eventLogsToUploadList).hasSize(2)
     // In this case, 3 ESSENTIAL and 1 OPTIONAL event was logged. So while pruning, none of the
     // retained logs should have OPTIONAL priority.
     assertThat(firstEventLog).isEssentialPriority()
@@ -668,7 +746,9 @@ class AnalyticsControllerTest {
       1556094120000
     )
     testCoroutineDispatchers.runCurrent()
-    assertThat(fakeSyncStatusManager.getSyncStatuses()).containsExactly(NO_CONNECTIVITY)
+
+    assertThat(testSyncStatusManager.getSyncStatuses())
+      .containsExactly(INITIAL_UNKNOWN, NO_CONNECTIVITY)
   }
 
   @Test
@@ -685,15 +765,259 @@ class AnalyticsControllerTest {
     )
     testCoroutineDispatchers.runCurrent()
 
-    val syncStatuses = fakeSyncStatusManager.getSyncStatuses()
-    assertThat(syncStatuses).containsExactly(DATA_UPLOADING, DATA_UPLOADED)
+    // 'Uploading' isn't an intermediate state when an event is directly logged.
+    val syncStatuses = testSyncStatusManager.getSyncStatuses()
+    assertThat(syncStatuses).containsExactly(INITIAL_UNKNOWN, DATA_UPLOADED)
+  }
+
+  @Test
+  fun testController_logImportantEvent_recordsEventAsUploaded() {
+    // The important event should be marked as uploaded.
+    analyticsController.logImportantEvent(oppiaLogger.createOpenHomeContext(), profileId = null)
+    testCoroutineDispatchers.runCurrent()
+
+    val logsProvider = analyticsController.getEventLogStore()
+    val uploadedLogs =
+      monitorFactory.waitForNextSuccessfulResult(logsProvider).uploadedEventLogsList
+    assertThat(uploadedLogs).hasSize(1)
+    assertThat(uploadedLogs.first()).hasOpenHomeContext()
+  }
+
+  @Test
+  fun testController_uploadEventLogs_noLogs_cacheUnchanged() {
+    val monitor = monitorFactory.createMonitor(analyticsController.getEventLogStore())
+
+    monitorFactory.ensureDataProviderExecutes(analyticsController.uploadEventLogs())
+
+    val logs = monitor.ensureNextResultIsSuccess()
+    assertThat(logs.eventLogsToUploadList).isEmpty()
+    assertThat(logs.uploadedEventLogsList).isEmpty()
+  }
+
+  @Test
+  fun testController_uploadEventLogs_noLogs_returnsPendingAndSimpleSuccessDataProvider() {
+    val uploadResults = monitorFactory.waitForAllNextResults {
+      analyticsController.uploadEventLogs()
+    }
+
+    assertThat(uploadResults).hasSize(2)
+    assertThat(uploadResults[0]).isPending()
+    assertThat(uploadResults[1]).isSuccessThat().isEqualTo(0 to 0)
+  }
+
+  @Test
+  fun testController_uploadEventLogs_withPreviousLogs_setsSyncStatusToUploadingThenUploaded() {
+    logTwoEvents()
+
+    monitorFactory.waitForAllNextResults { analyticsController.uploadEventLogs() }
+
+    // Note that no data is actually uploaded here since the earlier events were immediately
+    // logged (which is verified by the "DATA_UPLOADED" state that starts before uploading begins
+    // from the uploadEventLogs() function). Also, the "check first" and "check last" is because
+    // observing DataProvider changes over time is inherently unreliable because DataProviders are
+    // designed for eventual consistency, not for guaranteed state delivery. However, the
+    // synchronization in the test ensures that the expected states are at least observed once.
+    val statuses = testSyncStatusManager.getSyncStatuses()
+    assertThat(statuses.take(2)).containsExactly(INITIAL_UNKNOWN, DATA_UPLOADED).inOrder()
+    assertThat(statuses.takeLast(2)).containsExactly(DATA_UPLOADING, DATA_UPLOADED).inOrder()
+  }
+
+  @Test
+  fun testController_uploadEventLogs_withLogs_setsSyncStatusToUploadingThenUploaded() {
+    logTwoEventsOffline()
+
+    monitorFactory.waitForAllNextResults { analyticsController.uploadEventLogs() }
+
+    val statuses = testSyncStatusManager.getSyncStatuses()
+    assertThat(statuses)
+      .containsExactly(INITIAL_UNKNOWN, NO_CONNECTIVITY, DATA_UPLOADING, DATA_UPLOADED)
+      .inOrder()
+  }
+
+  @Test
+  fun testController_uploadEventLogs_withLogs_removesEventsForUploading() {
+    logTwoEventsOffline()
+
+    monitorFactory.waitForAllNextResults { analyticsController.uploadEventLogs() }
+
+    val eventLogs =
+      monitorFactory.waitForNextSuccessfulResult(analyticsController.getEventLogStore())
+    assertThat(eventLogs.eventLogsToUploadList).hasSize(0)
+    assertThat(eventLogs.uploadedEventLogsList).hasSize(2)
+  }
+
+  @Test
+  fun testController_uploadEventLogs_withPreviousLogs_recordsEventsAsUploaded() {
+    logTwoEvents()
+
+    monitorFactory.waitForAllNextResults { analyticsController.uploadEventLogs() }
+
+    assertThat(fakeAnalyticsEventLogger.getEventListCount()).isEqualTo(2)
+  }
+
+  @Test
+  fun testController_uploadEventLogs_withLogs_recordsEventsAsUploaded() {
+    logTwoEventsOffline()
+
+    monitorFactory.waitForAllNextResults { analyticsController.uploadEventLogs() }
+
+    assertThat(fakeAnalyticsEventLogger.getEventListCount()).isEqualTo(2)
+  }
+
+  @Test
+  fun testController_uploadEventLogs_withPreviousLogs_returnsProgressContext() {
+    logTwoEvents()
+
+    val uploadResults = monitorFactory.waitForAllNextResults {
+      analyticsController.uploadEventLogs()
+    }
+
+    // There's no progress to report since the events have already been uploaded.
+    assertThat(uploadResults).hasSize(2)
+    assertThat(uploadResults[0]).isPending()
+    assertThat(uploadResults[1]).isSuccessThat().isEqualTo(0 to 0)
+  }
+
+  @Test
+  fun testController_uploadEventLogs_withLogs_returnsProgressContext() {
+    logTwoEventsOffline()
+
+    val uploadResults = monitorFactory.waitForAllNextResults {
+      analyticsController.uploadEventLogs()
+    }
+
+    // Progress should be reported for each uploaded event. Note that this is inherently flaky since
+    // only the *last* result is guaranteed in DataProviders. As a result, *some* simple control
+    // flow is added to increase the test's robustness in such cases. NOTE TO DEVELOPERS: please do
+    // NOT copy this type of approach elsewhere--control flow is generally considered bad practice
+    // in tests and an exception is made here only because: (1) it's unavoidable with current
+    // synchronization mechanisms, (2) it's simple control flow, (3) it increases the test's
+    // robustness, and (4) the "happy path" base case is still verified without control flow.
+    assertThat(uploadResults.size).isAtLeast(1)
+    when (uploadResults.size) {
+      1 -> {} // Do nothing since only the result was received, and is verified below.
+      2 -> assertThat(uploadResults[0]).isPending()
+      3 -> {
+        assertThat(uploadResults[0]).isPending()
+        assertThat(uploadResults[1]).isSuccessThat().isEqualTo(1 to 2)
+      }
+      4 -> {
+        assertThat(uploadResults[0]).isPending()
+        assertThat(uploadResults[1]).isSuccessThat().isEqualTo(0 to 2)
+        assertThat(uploadResults[2]).isSuccessThat().isEqualTo(1 to 2)
+      }
+      else -> fail("Encountered too many upload results: ${uploadResults.size}.")
+    }
+    assertThat(uploadResults.last()).isSuccessThat().isEqualTo(2 to 2)
+  }
+
+  @Test
+  fun testController_uploadEventLogsAndWait_noLogs_cacheUnchanged() {
+    val monitor = monitorFactory.createMonitor(analyticsController.getEventLogStore())
+
+    runSynchronously { analyticsController.uploadEventLogsAndWait() }
+
+    val logs = monitor.ensureNextResultIsSuccess()
+    assertThat(logs.eventLogsToUploadList).isEmpty()
+    assertThat(logs.uploadedEventLogsList).isEmpty()
+  }
+
+  @Test
+  fun testController_uploadEventLogsAndWait_withPrevLogs_setsSyncStatusToUploadingThenUploaded() {
+    logTwoEvents()
+
+    runSynchronously { analyticsController.uploadEventLogsAndWait() }
+
+    // Note testController_uploadEventLogs_withPreviousLogs_setsSyncStatusToUploadingThenUploaded
+    // can't reliably check all status results since DataProviders don't guarantee observed values,
+    // but flows do (at least per uploadEventLogsAndWait's implementation & API contract). However,
+    // just as testController_uploadEventLogs_withPreviousLogs_setsSyncStatusToUploadingThenUploaded
+    // needs to verify the starts & ends of statuses, so does this test (for the rather rare case
+    // where it can result in duplicate values). Realistically, this seems to happen rarer than
+    // 1/100 with flows but it's still possible, so the test is designed to be a bit more robust
+    // against this possibility.
+    val statuses = testSyncStatusManager.getSyncStatuses()
+    assertThat(statuses.take(2)).containsExactly(INITIAL_UNKNOWN, DATA_UPLOADED).inOrder()
+    assertThat(statuses.takeLast(2)).containsExactly(DATA_UPLOADING, DATA_UPLOADED).inOrder()
+  }
+
+  @Test
+  fun testController_uploadEventLogsAndWait_withLogs_setsSyncStatusToUploadingThenUploaded() {
+    logTwoEventsOffline()
+
+    runSynchronously { analyticsController.uploadEventLogsAndWait() }
+
+    val statuses = testSyncStatusManager.getSyncStatuses()
+    assertThat(statuses)
+      .containsExactly(INITIAL_UNKNOWN, NO_CONNECTIVITY, DATA_UPLOADING, DATA_UPLOADED)
+      .inOrder()
+  }
+
+  @Test
+  fun testController_uploadEventLogsAndWait_withLogs_removesEventsForUploading() {
+    logTwoEventsOffline()
+
+    runSynchronously { analyticsController.uploadEventLogsAndWait() }
+
+    val eventLogs =
+      monitorFactory.waitForNextSuccessfulResult(analyticsController.getEventLogStore())
+    assertThat(eventLogs.eventLogsToUploadList).hasSize(0)
+    assertThat(eventLogs.uploadedEventLogsList).hasSize(2)
+  }
+
+  @Test
+  fun testController_uploadEventLogsAndWait_withPreviousLogs_recordsEventsAsUploaded() {
+    logTwoEvents()
+
+    runSynchronously { analyticsController.uploadEventLogsAndWait() }
+
+    assertThat(fakeAnalyticsEventLogger.getEventListCount()).isEqualTo(2)
+  }
+
+  @Test
+  fun testController_uploadEventLogsAndWait_withLogs_recordsEventsAsUploaded() {
+    logTwoEventsOffline()
+
+    runSynchronously { analyticsController.uploadEventLogsAndWait() }
+
+    assertThat(fakeAnalyticsEventLogger.getEventListCount()).isEqualTo(2)
+  }
+
+  @Test
+  fun testController_cachedEventsFromLastAppInstance_logNewEvent_onlyLatestEventLogged() {
+    // Simulate events being logged in a previous instance of the app.
+    logTwoCachedEventsDirectlyOnDisk()
+
+    analyticsController.logImportantEvent(oppiaLogger.createOpenHomeContext(), profileId = null)
+    testCoroutineDispatchers.runCurrent()
+
+    // Without a complete upload, only the most recent event will sync.
+    assertThat(fakeAnalyticsEventLogger.getEventListCount()).isEqualTo(1)
+  }
+
+  @Test
+  fun testController_cachedEventsFromLastAppInstance_logNewEvent_thenForceSync_everythingUploads() {
+    // Simulate events being logged in a previous instance of the app.
+    logTwoCachedEventsDirectlyOnDisk()
+    analyticsController.logImportantEvent(oppiaLogger.createOpenHomeContext(), profileId = null)
+    testCoroutineDispatchers.runCurrent()
+
+    runSynchronously { analyticsController.uploadEventLogsAndWait() }
+
+    // The force sync should ensure everything is uploaded. NOTE TO DEVELOPER: If this test is
+    // failing, it may be due to AnalyticsController being created before
+    // logTwoCachedEventsDirectlyOnDisk is called above. If that's the case, use the indirect
+    // injection pattern at the top of the test suite (for AnalyticsController itself) to ensure
+    // whichever dependency is injecting AnalyticsController is also only injected when needed (i.e.
+    // using a Provider).
+    assertThat(fakeAnalyticsEventLogger.getEventListCount()).isEqualTo(3)
   }
 
   private fun setUpTestApplicationComponent() {
     ApplicationProvider.getApplicationContext<TestApplication>().inject(this)
   }
 
-  private fun logMultipleEvents() {
+  private fun logFourEvents() {
     analyticsController.logImportantEvent(
       oppiaLogger.createOpenQuestionPlayerContext(
         TEST_QUESTION_ID,
@@ -743,6 +1067,29 @@ class AnalyticsControllerTest {
     testCoroutineDispatchers.runCurrent()
   }
 
+  private fun logTwoEvents() {
+    analyticsController.logImportantEvent(oppiaLogger.createOpenHomeContext(), profileId = null)
+    analyticsController.logLowPriorityEvent(oppiaLogger.createOpenHomeContext(), profileId = null)
+    testCoroutineDispatchers.runCurrent()
+  }
+
+  private fun logTwoEventsOffline() {
+    networkConnectionUtil.setCurrentConnectionStatus(NONE)
+    logTwoEvents()
+    networkConnectionUtil.setCurrentConnectionStatus(LOCAL)
+  }
+
+  private fun logTwoCachedEventsDirectlyOnDisk() {
+    persistentCacheStoryFactory.create(
+      "event_logs", OppiaEventLogs.getDefaultInstance()
+    ).storeDataAsync {
+      OppiaEventLogs.newBuilder().apply {
+        addEventLogsToUpload(createEventLog(context = oppiaLogger.createOpenHomeContext()))
+        addEventLogsToUpload(createEventLog(context = oppiaLogger.createOpenHomeContext()))
+      }.build()
+    }.waitForSuccessfulResult()
+  }
+
   private fun addNewProfileAndLogIn(): ProfileId {
     val addProfileProvider = profileManagementController.addProfile(
       name = "Test Profile",
@@ -796,6 +1143,43 @@ class AnalyticsControllerTest {
     monitorFactory.waitForNextSuccessfulResult(resultProvider)
   }
 
+  private fun runSynchronously(operation: suspend () -> Unit) =
+    CoroutineScope(backgroundDispatcher).async { operation() }.waitForSuccessfulResult()
+
+  private fun <T> Deferred<T>.waitForSuccessfulResult() {
+    return when (val result = waitForResult()) {
+      is AsyncResult.Pending -> error("Deferred never finished.")
+      is AsyncResult.Success -> {} // Nothing to do; the result succeeded.
+      is AsyncResult.Failure -> throw IllegalStateException("Deferred failed", result.error)
+    }
+  }
+
+  private fun <T> Deferred<T>.waitForResult() = toStateFlow().waitForLatestValue()
+
+  private fun <T> Deferred<T>.toStateFlow(): StateFlow<AsyncResult<T>> {
+    val deferred = this
+    return MutableStateFlow<AsyncResult<T>>(value = AsyncResult.Pending()).also { flow ->
+      CoroutineScope(backgroundDispatcher).async {
+        flow.emit(AsyncResult.Success(deferred.await()))
+      }.invokeOnCompletion {
+        it?.let { flow.tryEmit(AsyncResult.Failure(it)) }
+      }
+    }
+  }
+
+  private fun <T> StateFlow<T>.waitForLatestValue(): T =
+    also { testCoroutineDispatchers.runCurrent() }.value
+
+  private fun createEventLog(
+    context: EventLog.Context,
+    priority: EventLog.Priority = EventLog.Priority.ESSENTIAL,
+    timestamp: Long = oppiaClock.getCurrentTimeMs()
+  ) = EventLog.newBuilder().apply {
+    this.timestamp = timestamp
+    this.priority = priority
+    this.context = context
+  }.build()
+
   // TODO(#89): Move this to a common test application component.
   @Module
   class TestModule {
diff --git a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel
index 07798e4ca64..df824ae8075 100644
--- a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel
+++ b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel
@@ -18,8 +18,8 @@ oppia_android_test(
         "//testing",
         "//testing/src/main/java/org/oppia/android/testing/data:data_provider_test_monitor",
         "//testing/src/main/java/org/oppia/android/testing/logging:event_log_subject",
-        "//testing/src/main/java/org/oppia/android/testing/logging:fake_sync_status_manager",
         "//testing/src/main/java/org/oppia/android/testing/logging:sync_status_test_module",
+        "//testing/src/main/java/org/oppia/android/testing/logging:test_sync_status_manager",
         "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module",
         "//testing/src/main/java/org/oppia/android/testing/threading:test_coroutine_dispatchers",
         "//testing/src/main/java/org/oppia/android/testing/threading:test_module",
diff --git a/domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/BUILD.bazel b/domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/BUILD.bazel
new file mode 100644
index 00000000000..0f60989eacb
--- /dev/null
+++ b/domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/BUILD.bazel
@@ -0,0 +1,76 @@
+"""
+Tests for app-wide log uploading functionality.
+"""
+
+load("@dagger//:workspace_defs.bzl", "dagger_rules")
+load("//:oppia_android_test.bzl", "oppia_android_test")
+
+oppia_android_test(
+    name = "LogReportWorkManagerInitializerTest",
+    srcs = ["LogReportWorkManagerInitializerTest.kt"],
+    custom_package = "org.oppia.android.domain.oppialogger.loguploader",
+    test_class = "org.oppia.android.domain.oppialogger.loguploader.LogReportWorkManagerInitializerTest",
+    test_manifest = "//domain:test_manifest",
+    deps = [
+        ":dagger",
+        "//domain",
+        "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:cpu_module",
+        "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:prod_module",
+        "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/testing:fake_log_scheduler",
+        "//domain/src/main/java/org/oppia/android/domain/oppialogger/loguploader:initializer",
+        "//domain/src/main/java/org/oppia/android/domain/oppialogger/loguploader:worker",
+        "//domain/src/main/java/org/oppia/android/domain/oppialogger/loguploader:worker_module",
+        "//domain/src/main/java/org/oppia/android/domain/testing/oppialogger/loguploader:fake_log_uploader",
+        "//testing",
+        "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module",
+        "//testing/src/main/java/org/oppia/android/testing/threading:test_module",
+        "//testing/src/main/java/org/oppia/android/testing/time:test_module",
+        "//third_party:androidx_test_ext_junit",
+        "//third_party:androidx_work_work-testing",
+        "//third_party:com_google_truth_truth",
+        "//third_party:junit_junit",
+        "//third_party:org_robolectric_robolectric",
+        "//third_party:robolectric_android-all",
+        "//utility/src/main/java/org/oppia/android/util/caching:asset_prod_module",
+        "//utility/src/main/java/org/oppia/android/util/locale:prod_module",
+        "//utility/src/main/java/org/oppia/android/util/logging:metric_log_scheduler",
+        "//utility/src/main/java/org/oppia/android/util/networking:debug_module",
+        "//utility/src/main/java/org/oppia/android/util/networking:network_connection_debug_util",
+    ],
+)
+
+oppia_android_test(
+    name = "LogUploadWorkerTest",
+    srcs = ["LogUploadWorkerTest.kt"],
+    custom_package = "org.oppia.android.domain.oppialogger.loguploader",
+    test_class = "org.oppia.android.domain.oppialogger.loguploader.LogUploadWorkerTest",
+    test_manifest = "//domain:test_manifest",
+    deps = [
+        ":dagger",
+        "//domain",
+        "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:prod_module",
+        "//domain/src/main/java/org/oppia/android/domain/oppialogger/loguploader:worker",
+        "//domain/src/main/java/org/oppia/android/domain/oppialogger/loguploader:worker_module",
+        "//domain/src/main/java/org/oppia/android/domain/testing/oppialogger/loguploader:fake_log_uploader",
+        "//testing",
+        "//testing/src/main/java/org/oppia/android/testing/logging:sync_status_test_module",
+        "//testing/src/main/java/org/oppia/android/testing/logging:test_sync_status_manager",
+        "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module",
+        "//testing/src/main/java/org/oppia/android/testing/threading:test_module",
+        "//testing/src/main/java/org/oppia/android/testing/time:test_module",
+        "//third_party:androidx_test_ext_junit",
+        "//third_party:androidx_work_work-testing",
+        "//third_party:com_google_truth_truth",
+        "//third_party:junit_junit",
+        "//third_party:org_robolectric_robolectric",
+        "//third_party:robolectric_android-all",
+        "//utility/src/main/java/org/oppia/android/util/caching:asset_prod_module",
+        "//utility/src/main/java/org/oppia/android/util/locale:prod_module",
+        "//utility/src/main/java/org/oppia/android/util/logging/performancemetrics:performance_metrics_assessor_module",
+        "//utility/src/main/java/org/oppia/android/util/logging/performancemetrics:performance_metrics_configurations_module",
+        "//utility/src/main/java/org/oppia/android/util/networking:debug_module",
+        "//utility/src/main/java/org/oppia/android/util/networking:network_connection_debug_util",
+    ],
+)
+
+dagger_rules()
diff --git a/domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/LogUploadWorkerTest.kt b/domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/LogUploadWorkerTest.kt
index e3ea58cd2ef..dc1c9c5e976 100644
--- a/domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/LogUploadWorkerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/LogUploadWorkerTest.kt
@@ -43,8 +43,9 @@ import org.oppia.android.domain.testing.oppialogger.loguploader.FakeLogUploader
 import org.oppia.android.testing.FakeAnalyticsEventLogger
 import org.oppia.android.testing.FakeExceptionLogger
 import org.oppia.android.testing.FakePerformanceMetricsEventLogger
-import org.oppia.android.testing.logging.FakeSyncStatusManager
+import org.oppia.android.testing.data.DataProviderTestMonitor
 import org.oppia.android.testing.logging.SyncStatusTestModule
+import org.oppia.android.testing.logging.TestSyncStatusManager
 import org.oppia.android.testing.mockito.anyOrNull
 import org.oppia.android.testing.robolectric.RobolectricModule
 import org.oppia.android.testing.threading.TestCoroutineDispatchers
@@ -61,12 +62,14 @@ import org.oppia.android.util.logging.LogUploader
 import org.oppia.android.util.logging.LoggerModule
 import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.DATA_UPLOADED
 import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.DATA_UPLOADING
-import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.NETWORK_ERROR
+import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.INITIAL_UNKNOWN
 import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.NO_CONNECTIVITY
+import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.UPLOAD_ERROR
 import org.oppia.android.util.logging.performancemetrics.PerformanceMetricsAssessorModule
 import org.oppia.android.util.logging.performancemetrics.PerformanceMetricsConfigurationsModule
 import org.oppia.android.util.logging.performancemetrics.PerformanceMetricsEventLogger
 import org.oppia.android.util.networking.NetworkConnectionDebugUtil
+import org.oppia.android.util.networking.NetworkConnectionUtil.ProdConnectionStatus.LOCAL
 import org.oppia.android.util.networking.NetworkConnectionUtil.ProdConnectionStatus.NONE
 import org.oppia.android.util.networking.NetworkConnectionUtilDebugModule
 import org.robolectric.annotation.Config
@@ -97,9 +100,9 @@ class LogUploadWorkerTest {
   @Inject lateinit var logUploadWorkerFactory: LogUploadWorkerFactory
   @Inject lateinit var dataProviders: DataProviders
   @Inject lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
-  @Inject lateinit var fakeSyncStatusManager: FakeSyncStatusManager
-  @field:[Inject MockEventLogger] lateinit var mockAnalyticsEventLogger:
-    AnalyticsEventLogger
+  @Inject lateinit var testSyncStatusManager: TestSyncStatusManager
+  @Inject lateinit var monitorFactory: DataProviderTestMonitor.Factory
+  @field:[Inject MockEventLogger] lateinit var mockAnalyticsEventLogger: AnalyticsEventLogger
 
   private lateinit var context: Context
 
@@ -138,7 +141,7 @@ class LogUploadWorkerTest {
   }
 
   @Test
-  fun testWorker_logEvent_withoutNetwork_enqueueRequest_verifySuccess() {
+  fun testWorker_logEvent_withoutNetwork_enqueueRequest_verifyFailed() {
     networkConnectionUtil.setCurrentConnectionStatus(NONE)
     analyticsController.logImportantEvent(
       oppiaLogger.createOpenInfoTabContext(TEST_TOPIC_ID),
@@ -162,6 +165,37 @@ class LogUploadWorkerTest {
     testCoroutineDispatchers.runCurrent()
     val workInfo = workManager.getWorkInfoById(request.id)
 
+    // The enqueue should fail since the worker shouldn't be running when there's no network
+    // connectivity.
+    assertThat(workInfo.get().state).isEqualTo(WorkInfo.State.FAILED)
+  }
+
+  @Test
+  fun testWorker_logEvent_withNetwork_enqueueRequest_verifySuccess() {
+    networkConnectionUtil.setCurrentConnectionStatus(NONE)
+    analyticsController.logImportantEvent(
+      oppiaLogger.createOpenInfoTabContext(TEST_TOPIC_ID),
+      profileId = null,
+      eventLogTopicContext.timestamp
+    )
+    networkConnectionUtil.setCurrentConnectionStatus(LOCAL)
+    testCoroutineDispatchers.runCurrent()
+
+    val workManager = WorkManager.getInstance(ApplicationProvider.getApplicationContext())
+
+    val inputData = Data.Builder().putString(
+      LogUploadWorker.WORKER_CASE_KEY,
+      LogUploadWorker.EVENT_WORKER
+    ).build()
+
+    val request: OneTimeWorkRequest = OneTimeWorkRequestBuilder<LogUploadWorker>()
+      .setInputData(inputData)
+      .build()
+
+    workManager.enqueue(request)
+    testCoroutineDispatchers.runCurrent()
+    val workInfo = workManager.getWorkInfoById(request.id)
+
     assertThat(workInfo.get().state).isEqualTo(WorkInfo.State.SUCCEEDED)
     assertThat(fakeAnalyticsEventLogger.getMostRecentEvent()).isEqualTo(eventLogTopicContext)
   }
@@ -269,13 +303,14 @@ class LogUploadWorkerTest {
   }
 
   @Test
-  fun testWorker_logEvent_withoutNetwork_enqueueRequest_verifyCorrectSyncStatusSequence() {
+  fun testWorker_logEvent_withNetwork_enqueueRequest_verifySyncStatusesHasSuccess() {
     networkConnectionUtil.setCurrentConnectionStatus(NONE)
     analyticsController.logImportantEvent(
       oppiaLogger.createOpenInfoTabContext(TEST_TOPIC_ID),
       profileId = null,
       eventLogTopicContext.timestamp
     )
+    networkConnectionUtil.setCurrentConnectionStatus(LOCAL)
     testCoroutineDispatchers.runCurrent()
 
     val workManager = WorkManager.getInstance(ApplicationProvider.getApplicationContext())
@@ -292,12 +327,52 @@ class LogUploadWorkerTest {
     workManager.enqueue(request)
     testCoroutineDispatchers.runCurrent()
 
-    val statusList = fakeSyncStatusManager.getSyncStatuses()
-    assertThat(statusList).containsExactly(NO_CONNECTIVITY, DATA_UPLOADING, DATA_UPLOADED).inOrder()
+    val currentStatus =
+      monitorFactory.waitForNextSuccessfulResult(testSyncStatusManager.getSyncStatus())
+    val statusList = testSyncStatusManager.getSyncStatuses()
+    assertThat(statusList)
+      .containsAtLeast(INITIAL_UNKNOWN, DATA_UPLOADED, DATA_UPLOADING, DATA_UPLOADED)
+      .inOrder()
+    assertThat(currentStatus).isEqualTo(DATA_UPLOADED)
   }
 
   @Test
-  fun testWorker_logEvent_withoutNetwork_enqueueRequest_writeFails_verifySyncStatusIsFailed() {
+  fun testWorker_logEvent_withoutNetwork_enqueueRequest_verifySyncStatusesHasFailed() {
+    networkConnectionUtil.setCurrentConnectionStatus(NONE)
+    analyticsController.logImportantEvent(
+      oppiaLogger.createOpenInfoTabContext(TEST_TOPIC_ID),
+      profileId = null,
+      eventLogTopicContext.timestamp
+    )
+    testCoroutineDispatchers.runCurrent()
+
+    val workManager = WorkManager.getInstance(ApplicationProvider.getApplicationContext())
+
+    val inputData = Data.Builder().putString(
+      LogUploadWorker.WORKER_CASE_KEY,
+      LogUploadWorker.EVENT_WORKER
+    ).build()
+
+    val request: OneTimeWorkRequest = OneTimeWorkRequestBuilder<LogUploadWorker>()
+      .setInputData(inputData)
+      .build()
+
+    workManager.enqueue(request)
+    testCoroutineDispatchers.runCurrent()
+
+    val currentStatus =
+      monitorFactory.waitForNextSuccessfulResult(testSyncStatusManager.getSyncStatus())
+    val statusList = testSyncStatusManager.getSyncStatuses()
+    // The operation should fail since there's no internet connectivity with which to upload the
+    // events. It's not valid to try.
+    assertThat(statusList)
+      .containsAtLeast(INITIAL_UNKNOWN, DATA_UPLOADING, UPLOAD_ERROR, NO_CONNECTIVITY)
+      .inOrder()
+    assertThat(currentStatus).isEqualTo(NO_CONNECTIVITY)
+  }
+
+  @Test
+  fun testWorker_logEvent_withoutNetwork_enqueueRequest_writeFails_verifySyncStatusesHasFailed() {
     networkConnectionUtil.setCurrentConnectionStatus(NONE)
     analyticsController.logImportantEvent(
       oppiaLogger.createOpenInfoTabContext(TEST_TOPIC_ID),
@@ -321,8 +396,14 @@ class LogUploadWorkerTest {
     workManager.enqueue(request)
     testCoroutineDispatchers.runCurrent()
 
-    val statusList = fakeSyncStatusManager.getSyncStatuses()
-    assertThat(statusList).containsExactly(NO_CONNECTIVITY, DATA_UPLOADING, NETWORK_ERROR).inOrder()
+    // Note that "no connectivity" is the last item because it takes priority over an error.
+    val statusList = testSyncStatusManager.getSyncStatuses()
+    val currentStatus =
+      monitorFactory.waitForNextSuccessfulResult(testSyncStatusManager.getSyncStatus())
+    assertThat(statusList)
+      .containsAtLeast(INITIAL_UNKNOWN, DATA_UPLOADING, UPLOAD_ERROR, NO_CONNECTIVITY)
+      .inOrder()
+    assertThat(currentStatus).isEqualTo(NO_CONNECTIVITY)
   }
 
   private fun setUpEventLoggerToFail() {
@@ -337,22 +418,11 @@ class LogUploadWorkerTest {
    * Returns a list of lists of each relevant element of a [StackTraceElement] to be used for
    * comparison in a way that's consistent across JDK versions.
    */
-  private fun Array<StackTraceElement>.extractRelevantDetails(): List<List<Any>> {
-    return this.map { element ->
-      return@map listOf(
-        element.fileName,
-        element.methodName,
-        element.lineNumber,
-        element.className
-      )
-    }
-  }
+  private fun Array<StackTraceElement>.extractRelevantDetails(): List<List<Any>> =
+    map { elem -> listOf(elem.fileName, elem.methodName, elem.lineNumber, elem.className) }
 
   private fun setUpTestApplicationComponent() {
-    DaggerLogUploadWorkerTest_TestApplicationComponent.builder()
-      .setApplication(ApplicationProvider.getApplicationContext())
-      .build()
-      .inject(this)
+    ApplicationProvider.getApplicationContext<TestApplication>().inject(this)
   }
 
   @Qualifier
diff --git a/model/src/main/proto/BUILD.bazel b/model/src/main/proto/BUILD.bazel
index 3751a304dc7..8d066da9e21 100644
--- a/model/src/main/proto/BUILD.bazel
+++ b/model/src/main/proto/BUILD.bazel
@@ -46,6 +46,7 @@ oppia_proto_library(
     deps = [
         ":exploration_proto",
         ":languages_proto",
+        ":profile_proto",
     ],
 )
 
diff --git a/model/src/main/proto/oppia_logger.proto b/model/src/main/proto/oppia_logger.proto
index 5346b311ecc..92cbf713735 100644
--- a/model/src/main/proto/oppia_logger.proto
+++ b/model/src/main/proto/oppia_logger.proto
@@ -4,6 +4,7 @@ package model;
 
 import "exploration.proto";
 import "languages.proto";
+import "profile.proto";
 
 option java_package = "org.oppia.android.app.model";
 option java_multiple_files = true;
@@ -22,6 +23,11 @@ message EventLog {
   // The activity context of the event.
   Context context = 4;
 
+  // The profile to which this event corresponds, or empty if this event is not tied to a particular
+  // profile. This is only used for diagnostic purposes as events are only ever logged anonymously
+  // at source.
+  ProfileId profile_id = 8;
+
   // The app language selection context at the time of this event's creation.
   AppLanguageSelection app_language_selection = 5;
 
@@ -344,7 +350,12 @@ message ExceptionLog {
 
 // Structure for a container that contains event log reports.
 message OppiaEventLogs {
-  repeated EventLog event_log = 1;
+  // Contains all event logs pending to be uploaded for analytics that are likely cached due to the
+  // app not have internet connectivity at the time of wanting to originally log the event.
+  repeated EventLog event_logs_to_upload = 1;
+
+  // Contains all events that have been uploaded remotely to the analytics service.
+  repeated EventLog uploaded_event_logs = 2;
 }
 
 // Structure for a container that contains exception log reports.
diff --git a/model/src/main/proto/test.proto b/model/src/main/proto/test.proto
index 79f71dd6b6d..f846976ed69 100644
--- a/model/src/main/proto/test.proto
+++ b/model/src/main/proto/test.proto
@@ -10,6 +10,8 @@ message TestMessage {
   string str_value = 1;
 
   int32 int_value = 2;
+
+  repeated string str_values = 3;
 }
 
 // A version of TestMessage that is binary compatible, but is "newer".
diff --git a/scripts/assets/accessibility_label_exemptions.textproto b/scripts/assets/accessibility_label_exemptions.textproto
index 1685b4798ac..7c913075d50 100644
--- a/scripts/assets/accessibility_label_exemptions.textproto
+++ b/scripts/assets/accessibility_label_exemptions.textproto
@@ -9,6 +9,7 @@ exempted_activity: "app/src/main/java/org/oppia/android/app/player/state/testing
 exempted_activity: "app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditActivity"
 exempted_activity: "app/src/main/java/org/oppia/android/app/testing/AudioFragmentTestActivity"
 exempted_activity: "app/src/main/java/org/oppia/android/app/testing/BindableAdapterTestActivity"
+exempted_activity: "app/src/main/java/org/oppia/android/app/testing/CircularProgressIndicatorAdaptersTestActivity"
 exempted_activity: "app/src/main/java/org/oppia/android/app/testing/ConceptCardFragmentTestActivity"
 exempted_activity: "app/src/main/java/org/oppia/android/app/testing/DragDropTestActivity"
 exempted_activity: "app/src/main/java/org/oppia/android/app/testing/DrawableBindingAdaptersTestActivity"
diff --git a/scripts/assets/file_content_validation_checks.textproto b/scripts/assets/file_content_validation_checks.textproto
index b40b0408360..43addc32d4f 100644
--- a/scripts/assets/file_content_validation_checks.textproto
+++ b/scripts/assets/file_content_validation_checks.textproto
@@ -313,6 +313,8 @@ file_content_checks {
   exempted_file_name: "domain/src/test/java/org/oppia/android/domain/onboarding/AppStartupStateControllerTest.kt"
   exempted_file_name: "domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/LearnerAnalyticsLoggerTest.kt"
   exempted_file_name: "scripts/src/javatests/org/oppia/android/scripts/regex/RegexPatternValidationCheckTest.kt"
+  exempted_file_name: "testing/src/test/java/org/oppia/android/testing/logging/TestSyncStatusManagerTest.kt"
+  exempted_file_name: "utility/src/test/java/org/oppia/android/util/logging/EventBundleCreatorTest.kt"
   exempted_file_name: "utility/src/test/java/org/oppia/android/util/logging/performancemetrics/PerformanceMetricsAssessorImplTest.kt"
   exempted_file_name: "utility/src/test/java/org/oppia/android/util/math/ExpressionToComparableOperationConverterTest.kt"
   exempted_file_name: "utility/src/test/java/org/oppia/android/util/math/MathExpressionExtensionsTest.kt"
@@ -320,9 +322,8 @@ file_content_checks {
   exempted_file_name: "utility/src/test/java/org/oppia/android/util/math/MathTokenizerTest.kt"
   exempted_file_name: "utility/src/test/java/org/oppia/android/util/math/PolynomialExtensionsTest.kt"
   exempted_file_name: "utility/src/test/java/org/oppia/android/util/math/RealExtensionsTest.kt"
-  exempted_file_name: "utility/src/test/java/org/oppia/android/util/logging/performancemetrics/PerformanceMetricsAssessorImplTest.kt"
-  exempted_file_name: "utility/src/test/java/org/oppia/android/util/logging/EventBundleCreatorTest.kt"
   exempted_file_name: "utility/src/test/java/org/oppia/android/util/profile/ProfileNameValidatorTest.kt"
+  exempted_file_name: "utility/src/test/java/org/oppia/android/util/threading/AtomicEnumTest.kt"
   exempted_file_patterns: "testing/src/main/java/org/oppia/android/testing/junit/.+?\\.kt"
 }
 file_content_checks {
diff --git a/scripts/assets/kdoc_validity_exemptions.textproto b/scripts/assets/kdoc_validity_exemptions.textproto
index 341faf51068..6d50b4143ee 100644
--- a/scripts/assets/kdoc_validity_exemptions.textproto
+++ b/scripts/assets/kdoc_validity_exemptions.textproto
@@ -344,3 +344,4 @@ exempted_file_path: "utility/src/main/java/org/oppia/android/util/parser/html/Ma
 exempted_file_path: "utility/src/main/java/org/oppia/android/util/parser/image/UrlImageParser.kt"
 exempted_file_path: "utility/src/main/java/org/oppia/android/util/parser/svg/ScalableVectorGraphic.kt"
 exempted_file_path: "utility/src/main/java/org/oppia/android/util/platformparameter/PlatformParameterValue.kt"
+exempted_file_path: "utility/src/test/java/org/oppia/android/util/logging/SyncStatusManagerTestBase.kt"
diff --git a/scripts/assets/test_file_exemptions.textproto b/scripts/assets/test_file_exemptions.textproto
index 47768855e26..5395fa9682d 100644
--- a/scripts/assets/test_file_exemptions.textproto
+++ b/scripts/assets/test_file_exemptions.textproto
@@ -39,7 +39,7 @@ exempted_file_path: "app/src/main/java/org/oppia/android/app/administratorcontro
 exempted_file_path: "app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdFragmentPresenter.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileLearnerIdItemViewModel.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileListViewModel.kt"
-exempted_file_path: "app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ShareIdsViewModel.kt"
+exempted_file_path: "app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ControlButtonsViewModel.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/SyncStatusItemViewModel.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/application/AbstractOppiaApplication.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/application/ActivityComponentFactory.kt"
@@ -439,6 +439,8 @@ exempted_file_path: "app/src/main/java/org/oppia/android/app/testing/BindableAda
 exempted_file_path: "app/src/main/java/org/oppia/android/app/testing/BindableAdapterTestFragment.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/testing/BindableAdapterTestFragmentPresenter.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/testing/BindableAdapterTestViewModel.kt"
+exempted_file_path: "app/src/main/java/org/oppia/android/app/testing/CircularProgressIndicatorAdaptersTestActivity.kt"
+exempted_file_path: "app/src/main/java/org/oppia/android/app/testing/CircularProgressIndicatorAdaptersTestViewModel.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/testing/ConceptCardFragmentTestActivity.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/testing/ConceptCardFragmentTestActivityPresenter.kt"
 exempted_file_path: "app/src/main/java/org/oppia/android/app/testing/DragDropTestActivityPresenter.kt"
@@ -863,3 +865,4 @@ exempted_file_path: "utility/src/main/java/org/oppia/android/util/threading/Disp
 exempted_file_path: "utility/src/main/java/org/oppia/android/util/logging/performancemetrics/PerformanceMetricsAssessor.kt"
 exempted_file_path: "utility/src/main/java/org/oppia/android/util/logging/MetricLogScheduler.kt"
 exempted_file_path: "utility/src/main/java/org/oppia/android/util/logging/performancemetrics/PerformanceMetricsEventLogger.kt"
+exempted_file_path: "utility/src/test/java/org/oppia/android/util/logging/SyncStatusManagerTestBase.kt"
diff --git a/testing/src/main/java/org/oppia/android/testing/data/DataProviderTestMonitor.kt b/testing/src/main/java/org/oppia/android/testing/data/DataProviderTestMonitor.kt
index c9dec47324f..13b5f8812c1 100644
--- a/testing/src/main/java/org/oppia/android/testing/data/DataProviderTestMonitor.kt
+++ b/testing/src/main/java/org/oppia/android/testing/data/DataProviderTestMonitor.kt
@@ -5,6 +5,7 @@ import androidx.lifecycle.Observer
 import androidx.test.platform.app.InstrumentationRegistry
 import org.mockito.ArgumentCaptor
 import org.mockito.Mockito.atLeastOnce
+import org.mockito.Mockito.atMost
 import org.mockito.Mockito.mock
 import org.mockito.Mockito.never
 import org.mockito.Mockito.reset
@@ -41,7 +42,6 @@ class DataProviderTestMonitor<T> private constructor(
   private val dataProvider: DataProvider<T>
 ) {
   private val mockObserver by lazy { createMock<Observer<AsyncResult<T>>>() }
-  private val resultCaptor by lazy { createCaptor<AsyncResult<T>>() }
   private val liveData: LiveData<AsyncResult<T>> by lazy { dataProvider.toLiveData() }
 
   /**
@@ -113,9 +113,10 @@ class DataProviderTestMonitor<T> private constructor(
     // and an explicit monitor, it either means the provider hasn't updated or it requires advancing
     // the clock (in which case you should use TestCoroutineDispatchers.advanceUntilIdle() and an
     // ensure* method from this class).
-    verify(mockObserver, atLeastOnce()).onChanged(resultCaptor.capture())
-    reset(mockObserver)
-    return resultCaptor.value
+    return createCaptor<AsyncResult<T>>().also { resultCaptor ->
+      verify(mockObserver, atLeastOnce()).onChanged(resultCaptor.capture())
+      reset(mockObserver)
+    }.value
   }
 
   private fun retrieveSuccess(operation: () -> AsyncResult<T>): T {
@@ -139,6 +140,13 @@ class DataProviderTestMonitor<T> private constructor(
     }
   }
 
+  private fun collectAllResults(): List<AsyncResult<T>> {
+    return createCaptor<AsyncResult<T>>().also { resultCaptor ->
+      testCoroutineDispatchers.advanceUntilIdle()
+      verify(mockObserver, AnyNumber).onChanged(resultCaptor.capture())
+    }.allValues
+  }
+
   /**
    * Factory for creating new [DataProviderTestMonitor]s. This class should be injected within tests
    * at the application scope & requires the host test application component to include the
@@ -190,9 +198,7 @@ class DataProviderTestMonitor<T> private constructor(
      */
     fun <T> waitForNextSuccessfulResult(dataProvider: DataProvider<T>): T {
       val monitor = createMonitor(dataProvider)
-      return monitor.waitForNextSuccessResult().also {
-        monitor.stopObservingDataProvider()
-      }
+      return monitor.waitForNextSuccessResult().also { monitor.stopObservingDataProvider() }
     }
 
     /**
@@ -203,9 +209,35 @@ class DataProviderTestMonitor<T> private constructor(
      */
     fun <T> waitForNextFailureResult(dataProvider: DataProvider<T>): Throwable {
       val monitor = createMonitor(dataProvider)
-      return monitor.waitForNextFailingResult().also {
-        monitor.stopObservingDataProvider()
-      }
+      return monitor.waitForNextFailingResult().also { monitor.stopObservingDataProvider() }
+    }
+
+    /**
+     * Monitors for all possible results that are received starting exactly from the moment a new
+     * [DataProvider] is created by [createProvider].
+     *
+     * Note a few things:
+     * 1. This method tries to keep provider creation as close as possible to observation, but the
+     *    asynchronous nature of [DataProvider]s means that early results can still be missed.
+     * 2. [DataProvider]s are not an event system. Their "eventual consistency" property means that
+     *    the last result is most important to guarantee, so "in-between" states are possible to
+     *    miss (even in carefully time-coordinated test environments like Oppia's). It's
+     *    **highly suggested** to verify tests across ~100 runs that depend on this method to ensure
+     *    that they cannot flake out. Callers may need to verify specific values are present in the
+     *    list rather than verifying the whole list (since it could potentially change across test
+     *    runs with only the ending being reliable).
+     * 3. This method makes use of [TestCoroutineDispatchers.advanceUntilIdle] to minimize the
+     *    possibility of missing events, so callers should be aware that this will cause all pending
+     *    operations (even those in the future) to be run.
+     * 4. Care needs to be taken when [createProvider] returns, rather than creates, a
+     *    [DataProvider] as other methods in this class may cause the provider's results to be fully
+     *    observed before this method runs (which will cause it to return an empty list since it
+     *    only observes values *starting* at the time [createProvider] is called; any prior provided
+     *    values will be lost except the provider's latest value).
+     */
+    fun <T> waitForAllNextResults(createProvider: () -> DataProvider<T>): List<AsyncResult<T>> {
+      val monitor = createMonitor(createProvider())
+      return monitor.collectAllResults().also { monitor.stopObservingDataProvider() }
     }
   }
 
@@ -214,5 +246,8 @@ class DataProviderTestMonitor<T> private constructor(
 
     private inline fun <reified T> createCaptor(): ArgumentCaptor<T> =
       ArgumentCaptor.forClass(T::class.java)
+
+    // Approximate "any number" by limiting to a max number of calls.
+    private val AnyNumber by lazy { atMost(Integer.MAX_VALUE) }
   }
 }
diff --git a/testing/src/main/java/org/oppia/android/testing/logging/BUILD.bazel b/testing/src/main/java/org/oppia/android/testing/logging/BUILD.bazel
index 851b774df8e..e76a4a5184f 100644
--- a/testing/src/main/java/org/oppia/android/testing/logging/BUILD.bazel
+++ b/testing/src/main/java/org/oppia/android/testing/logging/BUILD.bazel
@@ -20,16 +20,17 @@ kt_android_library(
 )
 
 kt_android_library(
-    name = "fake_sync_status_manager",
+    name = "test_sync_status_manager",
     testonly = True,
     srcs = [
-        "FakeSyncStatusManager.kt",
+        "TestSyncStatusManager.kt",
     ],
     visibility = ["//:oppia_testing_visibility"],
     deps = [
         ":dagger",
         "//utility/src/main/java/org/oppia/android/util/logging:sync_status_manager",
         "//utility/src/main/java/org/oppia/android/util/logging:sync_status_manager_impl",
+        "//utility/src/main/java/org/oppia/android/util/threading:atomic_enum",
     ],
 )
 
@@ -42,7 +43,7 @@ kt_android_library(
     visibility = ["//:oppia_testing_visibility"],
     deps = [
         ":dagger",
-        ":fake_sync_status_manager",
+        ":test_sync_status_manager",
         "//utility/src/main/java/org/oppia/android/util/logging:sync_status_manager",
     ],
 )
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 e00c225560d..b7c1fd9f618 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
@@ -10,6 +10,7 @@ import com.google.common.truth.StringSubject
 import com.google.common.truth.Truth.assertAbout
 import com.google.common.truth.Truth.assertThat
 import com.google.common.truth.extensions.proto.LiteProtoSubject
+import com.google.common.truth.extensions.proto.LiteProtoTruth
 import org.oppia.android.app.model.AppLanguageSelection
 import org.oppia.android.app.model.AppLanguageSelection.SelectionTypeCase.USE_SYSTEM_LANGUAGE_OR_APP_DEFAULT
 import org.oppia.android.app.model.AudioTranslationLanguageSelection
@@ -87,6 +88,12 @@ class EventLogSubject private constructor(
     assertThat(actual.priority).isEqualTo(EventLog.Priority.OPTIONAL)
   }
 
+  /**
+   * Returns an [LiteProtoSubject] to verify the under-test [EventLog]'s [EventLog.getProfileId]
+   * field.
+   */
+  fun hasProfileIdThat(): LiteProtoSubject = LiteProtoTruth.assertThat(actual.profileId)
+
   /**
    * Returns an [AppLanguageSelectionSubject] to verify the under-test [EventLog]'s
    * [EventLog.getAppLanguageSelection] field.
diff --git a/testing/src/main/java/org/oppia/android/testing/logging/FakeSyncStatusManager.kt b/testing/src/main/java/org/oppia/android/testing/logging/FakeSyncStatusManager.kt
deleted file mode 100644
index 9b8bdc4b402..00000000000
--- a/testing/src/main/java/org/oppia/android/testing/logging/FakeSyncStatusManager.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.oppia.android.testing.logging
-
-import org.oppia.android.util.data.DataProvider
-import org.oppia.android.util.logging.SyncStatusManager
-import org.oppia.android.util.logging.SyncStatusManagerImpl
-import java.util.concurrent.CopyOnWriteArrayList
-import javax.inject.Inject
-import javax.inject.Singleton
-
-/**
- * A test-only implementation of [SyncStatusManager] that uses a real implementation internally, but
- * tracks all sync status set via [setSyncStatus].
- */
-@Singleton
-class FakeSyncStatusManager @Inject constructor(
-  private val syncStatusManagerImpl: SyncStatusManagerImpl
-) : SyncStatusManager {
-  private val trackedSyncStatuses = CopyOnWriteArrayList<SyncStatusManager.SyncStatus>()
-
-  override fun getSyncStatus(): DataProvider<SyncStatusManager.SyncStatus> =
-    syncStatusManagerImpl.getSyncStatus()
-
-  override fun setSyncStatus(syncStatus: SyncStatusManager.SyncStatus) {
-    trackedSyncStatuses += syncStatus
-    syncStatusManagerImpl.setSyncStatus(syncStatus)
-  }
-
-  /**
-   * Returns the list of all [SyncStatusManager.SyncStatus]s that were set via [setSyncStatus].
-   *
-   * Note that the order of values in the returned list will match the order [setSyncStatus] was
-   * called but may not match the exact order or presence of values propagated to the [DataProvider]
-   * returned by [getSyncStatus] (since [DataProvider]s guarantee eventual consistency and may skip
-   * values).
-   */
-  fun getSyncStatuses(): List<SyncStatusManager.SyncStatus> = trackedSyncStatuses
-}
diff --git a/testing/src/main/java/org/oppia/android/testing/logging/SyncStatusTestModule.kt b/testing/src/main/java/org/oppia/android/testing/logging/SyncStatusTestModule.kt
index ae881074596..a9cc82cf917 100644
--- a/testing/src/main/java/org/oppia/android/testing/logging/SyncStatusTestModule.kt
+++ b/testing/src/main/java/org/oppia/android/testing/logging/SyncStatusTestModule.kt
@@ -8,5 +8,5 @@ import org.oppia.android.util.logging.SyncStatusManager
 @Module
 interface SyncStatusTestModule {
   @Binds
-  fun bindSyncStatusManager(impl: FakeSyncStatusManager): SyncStatusManager
+  fun bindSyncStatusManager(impl: TestSyncStatusManager): SyncStatusManager
 }
diff --git a/testing/src/main/java/org/oppia/android/testing/logging/TestSyncStatusManager.kt b/testing/src/main/java/org/oppia/android/testing/logging/TestSyncStatusManager.kt
new file mode 100644
index 00000000000..ca4d7ac0f13
--- /dev/null
+++ b/testing/src/main/java/org/oppia/android/testing/logging/TestSyncStatusManager.kt
@@ -0,0 +1,120 @@
+package org.oppia.android.testing.logging
+
+import org.oppia.android.app.model.OppiaEventLogs
+import org.oppia.android.data.persistence.PersistentCacheStore
+import org.oppia.android.util.data.AsyncDataSubscriptionManager
+import org.oppia.android.util.data.AsyncResult
+import org.oppia.android.util.data.DataProviders.Companion.transform
+import org.oppia.android.util.logging.SyncStatusManager
+import org.oppia.android.util.logging.SyncStatusManager.SyncStatus
+import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.DATA_UPLOADED
+import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.DATA_UPLOADING
+import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.INITIAL_UNKNOWN
+import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.UPLOAD_ERROR
+import org.oppia.android.util.logging.SyncStatusManagerImpl
+import org.oppia.android.util.threading.AtomicEnum
+import java.util.concurrent.CopyOnWriteArrayList
+import java.util.concurrent.atomic.AtomicReference
+import javax.inject.Inject
+import javax.inject.Singleton
+
+private const val STATUS_PROVIDER_ID = "TestSyncStatusManager.sync_status_provider"
+
+/**
+ * A test-only implementation of [SyncStatusManager] that uses a real implementation internally, but
+ * tracks all sync statuses that are either produced by the real [SyncStatusManagerImpl] or are
+ * forced via calls to [forceSyncStatus]. These statuses can be observed using [getSyncStatuses].
+ */
+@Singleton
+class TestSyncStatusManager @Inject constructor(
+  private val syncStatusManagerImpl: SyncStatusManagerImpl,
+  private val asyncDataSubscriptionManager: AsyncDataSubscriptionManager
+) : SyncStatusManager {
+  // Include the initial status of the manager (since it won't be observed as a "change").
+  private val trackedSyncStatuses = CopyOnWriteArrayList(listOf(INITIAL_UNKNOWN))
+  private val syncStatusProvider =
+    syncStatusManagerImpl.getSyncStatus().also { syncStatusProvider ->
+      asyncDataSubscriptionManager.subscribe(syncStatusProvider.getId()) {
+        (syncStatusProvider.retrieveData() as? AsyncResult.Success)?.let {
+          maybeTrackNewSyncStatus(it.value)
+        }
+      }
+    }.transform(STATUS_PROVIDER_ID, ::augmentSyncStatus)
+  private val forcedSyncStatus = AtomicReference<SyncStatus?>(null)
+  private val latestSyncStatus = AtomicEnum.create(INITIAL_UNKNOWN)
+
+  override fun getSyncStatus() = syncStatusProvider
+
+  override fun initializeEventLogStore(eventLogStore: PersistentCacheStore<OppiaEventLogs>) {
+    syncStatusManagerImpl.initializeEventLogStore(eventLogStore)
+  }
+
+  override fun reportUploadingStarted() {
+    maybeTrackNewSyncStatus(DATA_UPLOADING)
+    syncStatusManagerImpl.reportUploadingStarted()
+  }
+
+  override fun reportUploadingEnded() {
+    maybeTrackNewSyncStatus(DATA_UPLOADED)
+    syncStatusManagerImpl.reportUploadingEnded()
+  }
+
+  override fun reportUploadError() {
+    maybeTrackNewSyncStatus(UPLOAD_ERROR)
+    syncStatusManagerImpl.reportUploadError()
+  }
+
+  /**
+   * Forces [getSyncStatus] to return the specified [syncStatus].
+   *
+   * The status will also be logged as part of the statuses returned by [getSyncStatuses].
+   *
+   * To revert the status back to the implementation's computed value, use [resetForcedSyncStatus].
+   */
+  fun forceSyncStatus(syncStatus: SyncStatus) {
+    maybeTrackNewSyncStatus(syncStatus, isForced = true)
+    updateForcedSyncStatus(syncStatus)
+  }
+
+  /**
+   * Resets the forced sync status set via [forceSyncStatus], if any, such that [getSyncStatus] will
+   * next return the correct computed sync status.
+   */
+  fun resetForcedSyncStatus() {
+    updateForcedSyncStatus(syncStatus = null)
+  }
+
+  /**
+   * Returns the list of all [SyncStatus]es that were computed via [SyncStatusManagerImpl] or forced
+   * via [forceSyncStatus].
+   *
+   * Note that the order of values in the returned list will match the order that statuses were
+   * computed, or forced. However, the asynchronous nature of sync statuses is such that there may
+   * be intermittent statuses reported "between" other changed events (such as
+   * [SyncStatus.NO_CONNECTIVITY] which sometimes will appear between other uploading statuses).
+   *
+   * Note also that changes to network connectivity will **not** result in changes to tracked
+   * statuses unless that change is also observed via the underlying implementation. See
+   * [SyncStatusManager.getSyncStatus] for more context.
+   */
+  fun getSyncStatuses(): List<SyncStatus> = trackedSyncStatuses.toList()
+
+  private fun updateForcedSyncStatus(syncStatus: SyncStatus?) {
+    forcedSyncStatus.set(syncStatus)
+    asyncDataSubscriptionManager.notifyChangeAsync(STATUS_PROVIDER_ID)
+  }
+
+  private fun maybeTrackNewSyncStatus(syncStatus: SyncStatus, isForced: Boolean = false) {
+    // It's possible for INITIAL_UNKNOWN to be delivered in slightly race condition-esque
+    // situations. While this is valid from SyncStatusManager's point of view (since the race
+    // condition will very quickly resolve itself due to DataProvider's eventual consistency
+    // property), it adds extra noise to tests that run into this situation. To make this a bit
+    // cleaner, filter out reversions back to "INITIAL_UNKNOWN" (unless they are forced).
+    if (!isForced && syncStatus == INITIAL_UNKNOWN) return
+    if (latestSyncStatus.getAndSet(syncStatus) != syncStatus) {
+      trackedSyncStatuses += syncStatus
+    }
+  }
+
+  private fun augmentSyncStatus(syncStatus: SyncStatus) = forcedSyncStatus.get() ?: syncStatus
+}
diff --git a/testing/src/main/java/org/oppia/android/testing/threading/TestDispatcherModule.kt b/testing/src/main/java/org/oppia/android/testing/threading/TestDispatcherModule.kt
index d88391f22e6..baef11cdb77 100644
--- a/testing/src/main/java/org/oppia/android/testing/threading/TestDispatcherModule.kt
+++ b/testing/src/main/java/org/oppia/android/testing/threading/TestDispatcherModule.kt
@@ -1,5 +1,6 @@
 package org.oppia.android.testing.threading
 
+import android.content.Context
 import dagger.Module
 import dagger.Provides
 import kotlinx.coroutines.CoroutineDispatcher
@@ -24,7 +25,8 @@ class TestDispatcherModule {
   @ExperimentalCoroutinesApi
   @BackgroundDispatcher
   fun provideBackgroundDispatcher(
-    @BackgroundTestDispatcher testCoroutineDispatcher: TestCoroutineDispatcher
+    @BackgroundTestDispatcher testCoroutineDispatcher: TestCoroutineDispatcher,
+    context: Context
   ): CoroutineDispatcher {
     return testCoroutineDispatcher
   }
diff --git a/testing/src/test/java/org/oppia/android/testing/data/DataProviderTestMonitorTest.kt b/testing/src/test/java/org/oppia/android/testing/data/DataProviderTestMonitorTest.kt
index 6335e207172..9df6e5257d3 100644
--- a/testing/src/test/java/org/oppia/android/testing/data/DataProviderTestMonitorTest.kt
+++ b/testing/src/test/java/org/oppia/android/testing/data/DataProviderTestMonitorTest.kt
@@ -9,6 +9,9 @@ import dagger.BindsInstance
 import dagger.Component
 import dagger.Module
 import dagger.Provides
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.async
 import kotlinx.coroutines.delay
 import org.junit.Before
 import org.junit.Test
@@ -31,6 +34,7 @@ import org.oppia.android.util.data.DataProvidersInjectorProvider
 import org.oppia.android.util.locale.LocaleProdModule
 import org.oppia.android.util.logging.LoggerModule
 import org.oppia.android.util.networking.NetworkConnectionUtilDebugModule
+import org.oppia.android.util.threading.BackgroundDispatcher
 import org.robolectric.annotation.Config
 import org.robolectric.annotation.LooperMode
 import javax.inject.Inject
@@ -49,6 +53,7 @@ class DataProviderTestMonitorTest {
   @Inject lateinit var dataProviders: DataProviders
   @Inject lateinit var asyncDataSubscriptionManager: AsyncDataSubscriptionManager
   @Inject lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
+  @field:[Inject BackgroundDispatcher] lateinit var backgroundDispatcher: CoroutineDispatcher
 
   @Before
   fun setUp() {
@@ -945,20 +950,188 @@ class DataProviderTestMonitorTest {
     assertThat(secondResult).hasMessageThat().contains("Second")
   }
 
+  /* Tests for waitForAllNextResults */
+
+  @Test
+  fun testWaitForAllNextResults_pendingProvider_returnsSingletonWithPending() {
+    val dataProvider = dataProviders.createInMemoryDataProviderAsync<String>("test") {
+      AsyncResult.Pending()
+    }
+
+    val results = monitorFactory.waitForAllNextResults { dataProvider }
+
+    assertThat(results).hasSize(1)
+    assertThat(results.first()).isPending()
+  }
+
+  @Test
+  fun testWaitForAllNextResults_failingProvider_returnsSingletonWithFailure() {
+    val dataProvider = dataProviders.createInMemoryDataProviderAsync<String>("test") {
+      AsyncResult.Failure(Exception("Failure"))
+    }
+
+    val results = monitorFactory.waitForAllNextResults { dataProvider }
+
+    assertThat(results).hasSize(1)
+    assertThat(results.first()).isFailureThat().hasMessageThat().contains("Failure")
+  }
+
+  @Test
+  fun testWaitForAllNextResults_successfulProvider_returnsSingletonWithSuccess() {
+    val dataProvider = dataProviders.createInMemoryDataProviderAsync("test") {
+      AsyncResult.Success("str value")
+    }
+
+    val results = monitorFactory.waitForAllNextResults { dataProvider }
+
+    assertThat(results).hasSize(1)
+    assertThat(results.first()).isSuccessThat().isEqualTo("str value")
+  }
+
+  @Test
+  fun testWaitForAllNextResults_pendingThenFailureProvider_returnsBoth() {
+    val dataProvider =
+      createDataProviderWithAutomaticResultsQueue(
+        "test", AsyncResult.Pending<String>(), AsyncResult.Failure(Exception("Failure"))
+      )
+
+    val results = monitorFactory.waitForAllNextResults { dataProvider }
+
+    assertThat(results).hasSize(2)
+    assertThat(results[0]).isPending()
+    assertThat(results[1]).isFailureThat().hasMessageThat().contains("Failure")
+  }
+
+  @Test
+  fun testWaitForAllNextResults_pendingThenSuccessProvider_returnsBoth() {
+    val dataProvider =
+      createDataProviderWithAutomaticResultsQueue(
+        "test", AsyncResult.Pending(), AsyncResult.Success("str value")
+      )
+
+    val results = monitorFactory.waitForAllNextResults { dataProvider }
+
+    assertThat(results).hasSize(2)
+    assertThat(results[0]).isPending()
+    assertThat(results[1]).isSuccessThat().isEqualTo("str value")
+  }
+
+  @Test
+  fun testWaitForAllNextResults_failureThenSuccessProvider_returnsBoth() {
+    val dataProvider =
+      createDataProviderWithAutomaticResultsQueue(
+        "test", AsyncResult.Failure(Exception("Failure")), AsyncResult.Success("str value")
+      )
+
+    val results = monitorFactory.waitForAllNextResults { dataProvider }
+
+    assertThat(results).hasSize(2)
+    assertThat(results[0]).isFailureThat().hasMessageThat().contains("Failure")
+    assertThat(results[1]).isSuccessThat().isEqualTo("str value")
+  }
+
+  @Test
+  fun testWaitForAllNextResults_multipleSuccessValuesProvider_returnsAll() {
+    val dataProvider =
+      createDataProviderWithAutomaticResultsQueue(
+        "test", AsyncResult.Success("1"), AsyncResult.Success("2"), AsyncResult.Success("3")
+      )
+
+    val results = monitorFactory.waitForAllNextResults { dataProvider }
+
+    assertThat(results).hasSize(3)
+    assertThat(results[0]).isSuccessThat().isEqualTo("1")
+    assertThat(results[1]).isSuccessThat().isEqualTo("2")
+    assertThat(results[2]).isSuccessThat().isEqualTo("3")
+  }
+
+  @Test
+  fun testWaitForAllNextResults_multipleSuccessValuesProvider_consumed_returnsNothing() {
+    val dataProvider =
+      createDataProviderWithAutomaticResultsQueue(
+        "test", AsyncResult.Success("1"), AsyncResult.Success("2"), AsyncResult.Success("3")
+      )
+    monitorFactory.waitForAllNextResults { dataProvider }
+
+    val results = monitorFactory.waitForAllNextResults { dataProvider }
+
+    assertThat(results).isEmpty()
+  }
+
+  @Test
+  fun testWaitForAllNextResults_multipleSuccessValuesProvider_consumed_changed_returnsLatest() {
+    val dataProvider =
+      createDataProviderWithResultsQueue(
+        "test", AsyncResult.Success("1"), AsyncResult.Success("2"), AsyncResult.Success("3")
+      )
+    autoNotifyDataProvider(dataProvider.getId(), count = 1) // Only notify for item 2.
+    monitorFactory.waitForAllNextResults { dataProvider }
+
+    autoNotifyDataProvider(dataProvider.getId(), count = 1) // Notify for item 3.
+    val results = monitorFactory.waitForAllNextResults { dataProvider }
+
+    // The latest value should be captured since the provider was "changed" after the first capture.
+    assertThat(results).hasSize(1)
+    assertThat(results.first()).isSuccessThat().isEqualTo("3")
+  }
+
+  @Test
+  fun testWaitForAllNextResults_createMultiResultProviderAgain_returnsLatest() {
+    monitorFactory.waitForAllNextResults {
+      createDataProviderWithAutomaticResultsQueue(
+        "test", AsyncResult.Success("1"), AsyncResult.Success("2"), AsyncResult.Success("3")
+      )
+    }
+
+    val results = monitorFactory.waitForAllNextResults {
+      createDataProviderWithAutomaticResultsQueue(
+        "test", AsyncResult.Success("1"), AsyncResult.Success("2"), AsyncResult.Success("3")
+      )
+    }
+
+    // The values should be observed from scratch since it's a completely new data provider.
+    assertThat(results).hasSize(3)
+    assertThat(results[0]).isSuccessThat().isEqualTo("1")
+    assertThat(results[1]).isSuccessThat().isEqualTo("2")
+    assertThat(results[2]).isSuccessThat().isEqualTo("3")
+  }
+
   private fun <T> createDataProviderWithResultsQueue(
     id: Any,
     vararg results: AsyncResult<T>
   ): DataProvider<T> {
     val resultsQueue = createResultQueue(*results)
-    return dataProviders.createInMemoryDataProviderAsync(id) {
-      resultsQueue.removeFirst()
+    return dataProviders.createInMemoryDataProviderAsync(id) { resultsQueue.removeFirst() }
+  }
+
+  private fun autoNotifyDataProvider(id: Any, count: Int) {
+    repeat(count) { index ->
+      // A subsequently increasing delay is introduced because: (1) it allows for the converted
+      // LiveData to post its result before the next value comes in (otherwise DataProviders'
+      // "eventual consistency" property results in lost observed values), and (2) because
+      // waitForAllNextResults runs all pending coroutine operations, including scheduled future
+      // tasks.
+      CoroutineScope(backgroundDispatcher).async {
+        delay(timeMillis = (index + 1).toLong())
+        asyncDataSubscriptionManager.notifyChange(id)
+      }.invokeOnCompletion { error -> error?.let { throw error } }
     }
   }
 
-  private fun <T> createResultQueue(vararg results: AsyncResult<T>): ArrayDeque<AsyncResult<T>> {
-    return ArrayDeque(results.toList())
+  private fun <T> createDataProviderWithAutomaticResultsQueue(
+    id: Any,
+    vararg results: AsyncResult<T>
+  ): DataProvider<T> {
+    return createDataProviderWithResultsQueue(id, *results).also {
+      // Notify that the provider has changed the number of elements in the queue (so that all are
+      // automatically consumed). This uses one minus the maximum since the first value of the queue
+      // is always implicitly retrieved upon the first retrieveData() call.
+      autoNotifyDataProvider(id, results.size - 1)
+    }
   }
 
+  private fun <T> createResultQueue(vararg results: AsyncResult<T>) = ArrayDeque(results.toList())
+
   private fun setUpTestApplicationComponent() {
     ApplicationProvider.getApplicationContext<TestApplication>().inject(this)
   }
diff --git a/testing/src/test/java/org/oppia/android/testing/logging/BUILD.bazel b/testing/src/test/java/org/oppia/android/testing/logging/BUILD.bazel
index df54586c2f8..740f52ae5f9 100644
--- a/testing/src/test/java/org/oppia/android/testing/logging/BUILD.bazel
+++ b/testing/src/test/java/org/oppia/android/testing/logging/BUILD.bazel
@@ -6,27 +6,29 @@ load("@dagger//:workspace_defs.bzl", "dagger_rules")
 load("//:oppia_android_test.bzl", "oppia_android_test")
 
 oppia_android_test(
-    name = "FakeSyncStatusManagerTest",
-    srcs = ["FakeSyncStatusManagerTest.kt"],
+    name = "TestSyncStatusManagerTest",
+    srcs = ["TestSyncStatusManagerTest.kt"],
     custom_package = "org.oppia.android.testing.logging",
-    test_class = "org.oppia.android.testing.logging.FakeSyncStatusManagerTest",
+    test_class = "org.oppia.android.testing.logging.TestSyncStatusManagerTest",
     test_manifest = "//testing:test_manifest",
     deps = [
         ":dagger",
         "//testing",
         "//testing/src/main/java/org/oppia/android/testing/data:data_provider_test_monitor",
-        "//testing/src/main/java/org/oppia/android/testing/logging:fake_sync_status_manager",
+        "//testing/src/main/java/org/oppia/android/testing/junit:oppia_parameterized_test_runner",
+        "//testing/src/main/java/org/oppia/android/testing/junit:parameterized_robolectric_test_runner",
+        "//testing/src/main/java/org/oppia/android/testing/logging:test_sync_status_manager",
         "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module",
         "//testing/src/main/java/org/oppia/android/testing/threading:test_coroutine_dispatchers",
         "//testing/src/main/java/org/oppia/android/testing/threading:test_module",
         "//testing/src/main/java/org/oppia/android/testing/time:test_module",
-        "//third_party:androidx_test_ext_junit",
         "//third_party:com_google_truth_truth",
         "//third_party:junit_junit",
         "//third_party:org_robolectric_robolectric",
         "//third_party:robolectric_android-all",
         "//utility/src/main/java/org/oppia/android/util/locale:prod_module",
         "//utility/src/main/java/org/oppia/android/util/networking:debug_module",
+        "//utility/src/test/java/org/oppia/android/util/logging:sync_status_manager_test_base",
     ],
 )
 
@@ -40,8 +42,8 @@ oppia_android_test(
         ":dagger",
         "//testing",
         "//testing/src/main/java/org/oppia/android/testing/data:data_provider_test_monitor",
-        "//testing/src/main/java/org/oppia/android/testing/logging:fake_sync_status_manager",
         "//testing/src/main/java/org/oppia/android/testing/logging:sync_status_test_module",
+        "//testing/src/main/java/org/oppia/android/testing/logging:test_sync_status_manager",
         "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module",
         "//testing/src/main/java/org/oppia/android/testing/threading:test_coroutine_dispatchers",
         "//testing/src/main/java/org/oppia/android/testing/threading:test_module",
diff --git a/testing/src/test/java/org/oppia/android/testing/logging/FakeSyncStatusManagerTest.kt b/testing/src/test/java/org/oppia/android/testing/logging/FakeSyncStatusManagerTest.kt
deleted file mode 100644
index d5e64b1b129..00000000000
--- a/testing/src/test/java/org/oppia/android/testing/logging/FakeSyncStatusManagerTest.kt
+++ /dev/null
@@ -1,210 +0,0 @@
-package org.oppia.android.testing.logging
-
-import android.app.Application
-import android.content.Context
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.google.common.truth.Truth.assertThat
-import dagger.BindsInstance
-import dagger.Component
-import dagger.Module
-import dagger.Provides
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.oppia.android.domain.oppialogger.LogStorageModule
-import org.oppia.android.testing.TestLogReportingModule
-import org.oppia.android.testing.data.DataProviderTestMonitor
-import org.oppia.android.testing.robolectric.RobolectricModule
-import org.oppia.android.testing.threading.TestDispatcherModule
-import org.oppia.android.testing.time.FakeOppiaClockModule
-import org.oppia.android.util.data.DataProvidersInjector
-import org.oppia.android.util.data.DataProvidersInjectorProvider
-import org.oppia.android.util.locale.LocaleProdModule
-import org.oppia.android.util.logging.LoggerModule
-import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.DATA_UPLOADED
-import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.DATA_UPLOADING
-import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.INITIAL_UNKNOWN
-import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.NETWORK_ERROR
-import org.oppia.android.util.networking.NetworkConnectionUtilDebugModule
-import org.robolectric.annotation.Config
-import org.robolectric.annotation.LooperMode
-import javax.inject.Inject
-import javax.inject.Singleton
-
-/** Tests for [FakeSyncStatusManager]. */
-// FunctionName: test names are conventionally named with underscores.
-@Suppress("FunctionName")
-@RunWith(AndroidJUnit4::class)
-@LooperMode(LooperMode.Mode.PAUSED)
-@Config(application = FakeSyncStatusManagerTest.TestApplication::class)
-class FakeSyncStatusManagerTest {
-  @Inject lateinit var fakeSyncStatusManager: FakeSyncStatusManager
-  @Inject lateinit var monitorFactory: DataProviderTestMonitor.Factory
-
-  @Before
-  fun setUp() {
-    setUpTestApplicationComponent()
-  }
-
-  @Test
-  fun testGetSyncStatus_initialState_returnsDefaultValue() {
-    val syncStatusProvider = fakeSyncStatusManager.getSyncStatus()
-
-    val state = monitorFactory.waitForNextSuccessfulResult(syncStatusProvider)
-    assertThat(state).isEqualTo(INITIAL_UNKNOWN)
-  }
-
-  @Test
-  fun testGetSyncStatuses_initialState_returnsEmptyList() {
-    val syncStatuses = fakeSyncStatusManager.getSyncStatuses()
-
-    assertThat(syncStatuses).isEmpty()
-  }
-
-  @Test
-  fun testGetSyncStatus_changeToUploading_returnsUploading() {
-    fakeSyncStatusManager.setSyncStatus(DATA_UPLOADING)
-
-    val syncStatusProvider = fakeSyncStatusManager.getSyncStatus()
-
-    // The retrieved state should be updated, similar to the production implementation.
-    val state = monitorFactory.waitForNextSuccessfulResult(syncStatusProvider)
-    assertThat(state).isEqualTo(DATA_UPLOADING)
-  }
-
-  @Test
-  fun testGetSyncStatus_changeToUploading_existingSubscription_updatesSubscriptionToUploading() {
-    val syncStatusProvider = fakeSyncStatusManager.getSyncStatus()
-    val monitor = monitorFactory.createMonitor(syncStatusProvider)
-    monitor.waitForNextResult()
-
-    fakeSyncStatusManager.setSyncStatus(DATA_UPLOADING)
-
-    // The existing subscription should be updated due to a notification (similar to the production
-    // implementation).
-    val state = monitor.waitForNextSuccessResult()
-    assertThat(state).isEqualTo(DATA_UPLOADING)
-  }
-
-  @Test
-  fun testGetSyncStatuses_changeToUploading_returnsUploading() {
-    fakeSyncStatusManager.setSyncStatus(DATA_UPLOADING)
-
-    val syncStatuses = fakeSyncStatusManager.getSyncStatuses()
-
-    // The new status value should be captured.
-    assertThat(syncStatuses).containsExactly(DATA_UPLOADING)
-  }
-
-  @Test
-  fun testGetSyncStatuses_changeToUploadingTwice_returnsDuplicatedUploadingStatuses() {
-    fakeSyncStatusManager.setSyncStatus(DATA_UPLOADING)
-    fakeSyncStatusManager.setSyncStatus(DATA_UPLOADING)
-
-    val syncStatuses = fakeSyncStatusManager.getSyncStatuses()
-
-    // Multiple changes to sync status should be captured.
-    assertThat(syncStatuses).containsExactly(DATA_UPLOADING, DATA_UPLOADING)
-  }
-
-  @Test
-  fun testGetSyncStatus_changeToUploadingThenNetworkError_returnsNetworkError() {
-    fakeSyncStatusManager.setSyncStatus(DATA_UPLOADING)
-    fakeSyncStatusManager.setSyncStatus(NETWORK_ERROR)
-
-    val syncStatusProvider = fakeSyncStatusManager.getSyncStatus()
-
-    // The latest retrieved state should be updated, similar to the production implementation.
-    val state = monitorFactory.waitForNextSuccessfulResult(syncStatusProvider)
-    assertThat(state).isEqualTo(NETWORK_ERROR)
-  }
-
-  @Test
-  fun testGetSyncStatuses_changeToUploadingThenNetworkError_returnsUploadingAndNetworkErrors() {
-    fakeSyncStatusManager.setSyncStatus(DATA_UPLOADING)
-    fakeSyncStatusManager.setSyncStatus(NETWORK_ERROR)
-
-    val syncStatuses = fakeSyncStatusManager.getSyncStatuses()
-
-    // Both status values should be captured.
-    assertThat(syncStatuses).containsExactly(DATA_UPLOADING, NETWORK_ERROR)
-  }
-
-  @Test
-  fun testGetSyncStatus_changeBetweenSeveralStates_returnsLatest() {
-    fakeSyncStatusManager.setSyncStatus(DATA_UPLOADING)
-    fakeSyncStatusManager.setSyncStatus(NETWORK_ERROR)
-    fakeSyncStatusManager.setSyncStatus(DATA_UPLOADING)
-    fakeSyncStatusManager.setSyncStatus(DATA_UPLOADED)
-
-    val syncStatusProvider = fakeSyncStatusManager.getSyncStatus()
-
-    // The latest retrieved state should be updated, similar to the production implementation.
-    val state = monitorFactory.waitForNextSuccessfulResult(syncStatusProvider)
-    assertThat(state).isEqualTo(DATA_UPLOADED)
-  }
-
-  @Test
-  fun testGetSyncStatuses_changeBetweenSeveralStates_returnsAllStatusesInOrder() {
-    fakeSyncStatusManager.setSyncStatus(DATA_UPLOADING)
-    fakeSyncStatusManager.setSyncStatus(NETWORK_ERROR)
-    fakeSyncStatusManager.setSyncStatus(DATA_UPLOADING)
-    fakeSyncStatusManager.setSyncStatus(DATA_UPLOADED)
-
-    val syncStatuses = fakeSyncStatusManager.getSyncStatuses()
-
-    // All status values should be captured, in order, including repeats.
-    assertThat(syncStatuses).containsExactly(
-      DATA_UPLOADING, NETWORK_ERROR, DATA_UPLOADING, DATA_UPLOADED
-    ).inOrder()
-  }
-
-  private fun setUpTestApplicationComponent() {
-    ApplicationProvider.getApplicationContext<TestApplication>().inject(this)
-  }
-
-  // TODO(#89): Move this to a common test application component.
-  @Module
-  class TestModule {
-    @Provides
-    @Singleton
-    fun provideContext(application: Application): Context {
-      return application
-    }
-  }
-
-  // TODO(#89): Move this to a common test application component.
-  @Singleton
-  @Component(
-    modules = [
-      TestModule::class, LogStorageModule::class, NetworkConnectionUtilDebugModule::class,
-      TestLogReportingModule::class, LoggerModule::class, TestDispatcherModule::class,
-      LocaleProdModule::class, FakeOppiaClockModule::class, RobolectricModule::class
-    ]
-  )
-  interface TestApplicationComponent : DataProvidersInjector {
-    @Component.Builder
-    interface Builder {
-      @BindsInstance
-      fun setApplication(application: Application): Builder
-      fun build(): TestApplicationComponent
-    }
-
-    fun inject(test: FakeSyncStatusManagerTest)
-  }
-
-  class TestApplication : Application(), DataProvidersInjectorProvider {
-    private val component: TestApplicationComponent by lazy {
-      DaggerFakeSyncStatusManagerTest_TestApplicationComponent.builder()
-        .setApplication(this)
-        .build()
-    }
-
-    fun inject(test: FakeSyncStatusManagerTest) {
-      component.inject(test)
-    }
-
-    override fun getDataProvidersInjector(): DataProvidersInjector = component
-  }
-}
diff --git a/testing/src/test/java/org/oppia/android/testing/logging/SyncStatusTestModuleTest.kt b/testing/src/test/java/org/oppia/android/testing/logging/SyncStatusTestModuleTest.kt
index 9bb9bedf26c..c1ce88dae6c 100644
--- a/testing/src/test/java/org/oppia/android/testing/logging/SyncStatusTestModuleTest.kt
+++ b/testing/src/test/java/org/oppia/android/testing/logging/SyncStatusTestModuleTest.kt
@@ -41,8 +41,8 @@ class SyncStatusTestModuleTest {
   }
 
   @Test
-  fun testInjectSyncStatusManager_isInstanceOfFakeSyncStatusManager() {
-    assertThat(syncStatusManager).isInstanceOf(FakeSyncStatusManager::class.java)
+  fun testInjectSyncStatusManager_isInstanceOfTestSyncStatusManager() {
+    assertThat(syncStatusManager).isInstanceOf(TestSyncStatusManager::class.java)
   }
 
   private fun setUpTestApplicationComponent() {
diff --git a/testing/src/test/java/org/oppia/android/testing/logging/TestSyncStatusManagerTest.kt b/testing/src/test/java/org/oppia/android/testing/logging/TestSyncStatusManagerTest.kt
new file mode 100644
index 00000000000..e20b1fd1b62
--- /dev/null
+++ b/testing/src/test/java/org/oppia/android/testing/logging/TestSyncStatusManagerTest.kt
@@ -0,0 +1,997 @@
+package org.oppia.android.testing.logging
+
+import android.app.Application
+import android.content.Context
+import androidx.test.core.app.ApplicationProvider
+import com.google.common.truth.Truth.assertThat
+import dagger.BindsInstance
+import dagger.Component
+import dagger.Module
+import dagger.Provides
+import kotlinx.coroutines.CoroutineDispatcher
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.oppia.android.app.model.EventLog
+import org.oppia.android.data.persistence.PersistentCacheStore
+import org.oppia.android.domain.oppialogger.LogStorageModule
+import org.oppia.android.testing.TestLogReportingModule
+import org.oppia.android.testing.data.DataProviderTestMonitor
+import org.oppia.android.testing.junit.OppiaParameterizedTestRunner
+import org.oppia.android.testing.junit.OppiaParameterizedTestRunner.Iteration
+import org.oppia.android.testing.junit.OppiaParameterizedTestRunner.Parameter
+import org.oppia.android.testing.junit.OppiaParameterizedTestRunner.RunParameterized
+import org.oppia.android.testing.junit.OppiaParameterizedTestRunner.SelectRunnerPlatform
+import org.oppia.android.testing.junit.ParameterizedRobolectricTestRunner
+import org.oppia.android.testing.networking.NetworkConnectionTestUtil
+import org.oppia.android.testing.robolectric.RobolectricModule
+import org.oppia.android.testing.threading.TestCoroutineDispatchers
+import org.oppia.android.testing.threading.TestDispatcherModule
+import org.oppia.android.testing.time.FakeOppiaClockModule
+import org.oppia.android.util.data.DataProvidersInjector
+import org.oppia.android.util.data.DataProvidersInjectorProvider
+import org.oppia.android.util.locale.LocaleProdModule
+import org.oppia.android.util.logging.LoggerModule
+import org.oppia.android.util.logging.SyncStatusManager.SyncStatus
+import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.DATA_UPLOADED
+import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.DATA_UPLOADING
+import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.INITIAL_UNKNOWN
+import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.NO_CONNECTIVITY
+import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.UPLOAD_ERROR
+import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.WAITING_TO_START_UPLOADING
+import org.oppia.android.util.logging.SyncStatusManagerTestBase
+import org.oppia.android.util.networking.NetworkConnectionUtilDebugModule
+import org.oppia.android.util.threading.BackgroundDispatcher
+import org.robolectric.annotation.Config
+import org.robolectric.annotation.LooperMode
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/** Tests for [TestSyncStatusManager]. */
+// Same parameter value: helpers reduce test context, even if they are used by 1 test.
+// Function name: test names are conventionally named with underscores.
+@Suppress("SameParameterValue", "FunctionName")
+@RunWith(OppiaParameterizedTestRunner::class)
+@SelectRunnerPlatform(ParameterizedRobolectricTestRunner::class)
+@LooperMode(LooperMode.Mode.PAUSED)
+@Config(application = TestSyncStatusManagerTest.TestApplication::class)
+class TestSyncStatusManagerTest : SyncStatusManagerTestBase() {
+  @Inject override lateinit var impl: TestSyncStatusManager
+  @Inject override lateinit var monitorFactory: DataProviderTestMonitor.Factory
+  @Inject override lateinit var persistentCacheStoreFactory: PersistentCacheStore.Factory
+  @Inject override lateinit var networkConnectionTestUtil: NetworkConnectionTestUtil
+  @Inject override lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
+  @field:[Inject BackgroundDispatcher]
+  override lateinit var backgroundDispatcher: CoroutineDispatcher
+
+  @Parameter lateinit var status: String
+
+  private val syncStatus by lazy { SyncStatus.valueOf(status) }
+
+  @Before
+  fun setUp() {
+    setUpTestApplicationComponent()
+  }
+
+  @Test
+  fun testForceSyncStatus_initialState_forceInitialState_doesNotChangeGetSyncStatusProvider() {
+    val syncStatusMonitor = monitorFactory.createMonitor(impl.getSyncStatus())
+
+    impl.forceSyncStatus(INITIAL_UNKNOWN)
+    testCoroutineDispatchers.runCurrent()
+
+    syncStatusMonitor.verifyProviderIsNotUpdated()
+  }
+
+  @Test
+  fun testForceSyncStatus_initialState_forceDifferentState_changesGetSyncStatusProvider() {
+    val syncStatusMonitor = monitorFactory.createMonitor(impl.getSyncStatus())
+
+    impl.forceSyncStatus(WAITING_TO_START_UPLOADING)
+    testCoroutineDispatchers.runCurrent()
+
+    syncStatusMonitor.ensureNextResultIsSuccess()
+  }
+
+  @Test
+  fun testResetForcedSyncStatus_initialState_noForcedStatus_doesNotChangeGetSyncStatusProvider() {
+    val syncStatusMonitor = monitorFactory.createMonitor(impl.getSyncStatus())
+
+    impl.resetForcedSyncStatus()
+    testCoroutineDispatchers.runCurrent()
+
+    syncStatusMonitor.verifyProviderIsNotUpdated()
+  }
+
+  @Test
+  fun testResetForcedSyncStatus_initialState_forceInitState_doesNotChangeGetSyncStatusProvider() {
+    impl.forceSyncStatus(INITIAL_UNKNOWN)
+    val syncStatusMonitor = monitorFactory.createMonitor(impl.getSyncStatus())
+
+    impl.resetForcedSyncStatus()
+    testCoroutineDispatchers.runCurrent()
+
+    syncStatusMonitor.verifyProviderIsNotUpdated()
+  }
+
+  @Test
+  fun testResetForcedSyncStatus_initialState_forceDifferenceState_changeGetSyncStatusProvider() {
+    impl.forceSyncStatus(WAITING_TO_START_UPLOADING)
+    val syncStatusMonitor = monitorFactory.createMonitor(impl.getSyncStatus())
+
+    impl.resetForcedSyncStatus()
+    testCoroutineDispatchers.runCurrent()
+
+    // The provider should change since the initial state was actually overwritten.
+    syncStatusMonitor.ensureNextResultIsSuccess()
+  }
+
+  @Test
+  fun testGetSyncStatus_withForcedInitialUnknown_returnsInitialUnknown() {
+    val syncStatusProvider = impl.getSyncStatus()
+
+    impl.forceSyncStatus(INITIAL_UNKNOWN)
+
+    val syncStatus = monitorFactory.waitForNextSuccessfulResult(syncStatusProvider)
+    assertThat(syncStatus).isEqualTo(INITIAL_UNKNOWN)
+  }
+
+  @Test
+  fun testGetSyncStatus_withForcedWaitingToStartUploading_returnsWaitingToStartUploading() {
+    val syncStatusProvider = impl.getSyncStatus()
+
+    impl.forceSyncStatus(WAITING_TO_START_UPLOADING)
+
+    val syncStatus = monitorFactory.waitForNextSuccessfulResult(syncStatusProvider)
+    assertThat(syncStatus).isEqualTo(WAITING_TO_START_UPLOADING)
+  }
+
+  @Test
+  fun testGetSyncStatus_withForcedDataUploading_returnsDataUploading() {
+    val syncStatusProvider = impl.getSyncStatus()
+
+    impl.forceSyncStatus(DATA_UPLOADING)
+
+    val syncStatus = monitorFactory.waitForNextSuccessfulResult(syncStatusProvider)
+    assertThat(syncStatus).isEqualTo(DATA_UPLOADING)
+  }
+
+  @Test
+  fun testGetSyncStatus_withForcedDataUploaded_returnsDataUploaded() {
+    val syncStatusProvider = impl.getSyncStatus()
+
+    impl.forceSyncStatus(DATA_UPLOADED)
+
+    val syncStatus = monitorFactory.waitForNextSuccessfulResult(syncStatusProvider)
+    assertThat(syncStatus).isEqualTo(DATA_UPLOADED)
+  }
+
+  @Test
+  fun testGetSyncStatus_withForcedNoConnectivity_returnsNoConnectivity() {
+    val syncStatusProvider = impl.getSyncStatus()
+
+    impl.forceSyncStatus(NO_CONNECTIVITY)
+
+    val syncStatus = monitorFactory.waitForNextSuccessfulResult(syncStatusProvider)
+    assertThat(syncStatus).isEqualTo(NO_CONNECTIVITY)
+  }
+
+  @Test
+  fun testGetSyncStatus_withForcedNetworkUpload_returnsUploadError() {
+    val syncStatusProvider = impl.getSyncStatus()
+
+    impl.forceSyncStatus(UPLOAD_ERROR)
+
+    val syncStatus = monitorFactory.waitForNextSuccessfulResult(syncStatusProvider)
+    assertThat(syncStatus).isEqualTo(UPLOAD_ERROR)
+  }
+
+  @Test
+  fun testGetSyncStatus_withForcedUploadError_thenDataUploaded_returnsDataUploaded() {
+    val syncStatusProvider = impl.getSyncStatus()
+    impl.forceSyncStatus(UPLOAD_ERROR)
+
+    impl.forceSyncStatus(DATA_UPLOADED)
+
+    // Verify that later calls to forceSyncStatus overwrites previous calls.
+    val syncStatus = monitorFactory.waitForNextSuccessfulResult(syncStatusProvider)
+    assertThat(syncStatus).isEqualTo(DATA_UPLOADED)
+  }
+
+  @Test
+  @RunParameterized(
+    Iteration("initial_unknown", "status=INITIAL_UNKNOWN"),
+    Iteration("waiting_to_start_uploading", "status=WAITING_TO_START_UPLOADING"),
+    Iteration("data_uploading", "status=DATA_UPLOADING"),
+    Iteration("data_uploaded", "status=DATA_UPLOADED"),
+    Iteration("no_connectivity", "status=NO_CONNECTIVITY"),
+    Iteration("upload_error", "status=UPLOAD_ERROR")
+  )
+  fun testGetSyncStatus_withInitedLogStore_forceStatus_noConnectivity_returnsForcedStatus() {
+    val syncStatusProvider = impl.getSyncStatus()
+    impl.initializeEventLogStore(logsCacheStore)
+    disconnectNetwork()
+
+    impl.forceSyncStatus(syncStatus)
+    testCoroutineDispatchers.runCurrent()
+
+    // The forced status should overwrite the current manager's sync status state.
+    val syncStatus = monitorFactory.waitForNextSuccessfulResult(syncStatusProvider)
+    assertThat(syncStatus).isEqualTo(syncStatus)
+  }
+
+  @Test
+  @RunParameterized(
+    Iteration("initial_unknown", "status=INITIAL_UNKNOWN"),
+    Iteration("waiting_to_start_uploading", "status=WAITING_TO_START_UPLOADING"),
+    Iteration("data_uploading", "status=DATA_UPLOADING"),
+    Iteration("data_uploaded", "status=DATA_UPLOADED"),
+    Iteration("no_connectivity", "status=NO_CONNECTIVITY"),
+    Iteration("upload_error", "status=UPLOAD_ERROR")
+  )
+  fun testGetSyncStatus_withInitedLogStore_forceStatus_noEvents_returnsForcedStatus() {
+    val syncStatusProvider = impl.getSyncStatus()
+    impl.initializeEventLogStore(logsCacheStore)
+    connectNetwork()
+
+    impl.forceSyncStatus(syncStatus)
+    testCoroutineDispatchers.runCurrent()
+
+    // The forced status should overwrite the current manager's sync status state.
+    val syncStatus = monitorFactory.waitForNextSuccessfulResult(syncStatusProvider)
+    assertThat(syncStatus).isEqualTo(syncStatus)
+  }
+
+  @Test
+  @RunParameterized(
+    Iteration("initial_unknown", "status=INITIAL_UNKNOWN"),
+    Iteration("waiting_to_start_uploading", "status=WAITING_TO_START_UPLOADING"),
+    Iteration("data_uploading", "status=DATA_UPLOADING"),
+    Iteration("data_uploaded", "status=DATA_UPLOADED"),
+    Iteration("no_connectivity", "status=NO_CONNECTIVITY"),
+    Iteration("upload_error", "status=UPLOAD_ERROR")
+  )
+  fun testGetSyncStatus_withInitedLogStore_forceStatus_withEvents_returnsForcedStatus() {
+    val syncStatusProvider = impl.getSyncStatus()
+    impl.initializeEventLogStore(logsCacheStore)
+    connectNetwork()
+    queueEventLogForUploading(EVENT_LOG_0)
+    queueEventLogForUploading(EVENT_LOG_1)
+
+    impl.forceSyncStatus(syncStatus)
+    testCoroutineDispatchers.runCurrent()
+
+    // The forced status should overwrite the current manager's sync status state.
+    val syncStatus = monitorFactory.waitForNextSuccessfulResult(syncStatusProvider)
+    assertThat(syncStatus).isEqualTo(syncStatus)
+  }
+
+  @Test
+  @RunParameterized(
+    Iteration("initial_unknown", "status=INITIAL_UNKNOWN"),
+    Iteration("waiting_to_start_uploading", "status=WAITING_TO_START_UPLOADING"),
+    Iteration("data_uploading", "status=DATA_UPLOADING"),
+    Iteration("data_uploaded", "status=DATA_UPLOADED"),
+    Iteration("no_connectivity", "status=NO_CONNECTIVITY"),
+    Iteration("upload_error", "status=UPLOAD_ERROR")
+  )
+  fun testGetSyncStatus_withInitedLogStore_forceStatus_withEvents_allRemoved_returnsForcedStatus() {
+    val syncStatusProvider = impl.getSyncStatus()
+    impl.initializeEventLogStore(logsCacheStore)
+    connectNetwork()
+    queueEventLogForUploading(EVENT_LOG_0)
+    queueEventLogForUploading(EVENT_LOG_1)
+    moveEventLogToUploaded(EVENT_LOG_0)
+    moveEventLogToUploaded(EVENT_LOG_1)
+
+    impl.forceSyncStatus(syncStatus)
+    testCoroutineDispatchers.runCurrent()
+
+    // The forced status should overwrite the current manager's sync status state.
+    val syncStatus = monitorFactory.waitForNextSuccessfulResult(syncStatusProvider)
+    assertThat(syncStatus).isEqualTo(syncStatus)
+  }
+
+  @Test
+  @RunParameterized(
+    Iteration("initial_unknown", "status=INITIAL_UNKNOWN"),
+    Iteration("waiting_to_start_uploading", "status=WAITING_TO_START_UPLOADING"),
+    Iteration("data_uploading", "status=DATA_UPLOADING"),
+    Iteration("data_uploaded", "status=DATA_UPLOADED"),
+    Iteration("no_connectivity", "status=NO_CONNECTIVITY"),
+    Iteration("upload_error", "status=UPLOAD_ERROR")
+  )
+  fun testGetSyncStatus_withInitedLogs_forceStatus_reportUploadingStarted_returnsForcedStatus() {
+    val syncStatusProvider = impl.getSyncStatus()
+    impl.initializeEventLogStore(logsCacheStore)
+    connectNetwork()
+    queueEventLogForUploading(EVENT_LOG_0)
+    impl.reportUploadingStarted()
+
+    impl.forceSyncStatus(syncStatus)
+    testCoroutineDispatchers.runCurrent()
+
+    // The forced status should overwrite the current manager's sync status state.
+    val syncStatus = monitorFactory.waitForNextSuccessfulResult(syncStatusProvider)
+    assertThat(syncStatus).isEqualTo(syncStatus)
+  }
+
+  @Test
+  @RunParameterized(
+    Iteration("initial_unknown", "status=INITIAL_UNKNOWN"),
+    Iteration("waiting_to_start_uploading", "status=WAITING_TO_START_UPLOADING"),
+    Iteration("data_uploading", "status=DATA_UPLOADING"),
+    Iteration("data_uploaded", "status=DATA_UPLOADED"),
+    Iteration("no_connectivity", "status=NO_CONNECTIVITY"),
+    Iteration("upload_error", "status=UPLOAD_ERROR")
+  )
+  fun testGetSyncStatus_withInitedLogStore_forceStatus_reportUploadingEnded_returnsForcedStatus() {
+    val syncStatusProvider = impl.getSyncStatus()
+    impl.initializeEventLogStore(logsCacheStore)
+    connectNetwork()
+    queueEventLogForUploading(EVENT_LOG_0)
+    impl.reportUploadingStarted()
+    moveEventLogToUploaded(EVENT_LOG_0)
+    impl.reportUploadingEnded()
+    testCoroutineDispatchers.runCurrent()
+
+    impl.forceSyncStatus(syncStatus)
+    testCoroutineDispatchers.runCurrent()
+
+    // The forced status should overwrite the current manager's sync status state.
+    val syncStatus = monitorFactory.waitForNextSuccessfulResult(syncStatusProvider)
+    assertThat(syncStatus).isEqualTo(syncStatus)
+  }
+
+  @Test
+  @RunParameterized(
+    Iteration("initial_unknown", "status=INITIAL_UNKNOWN"),
+    Iteration("waiting_to_start_uploading", "status=WAITING_TO_START_UPLOADING"),
+    Iteration("data_uploading", "status=DATA_UPLOADING"),
+    Iteration("data_uploaded", "status=DATA_UPLOADED"),
+    Iteration("no_connectivity", "status=NO_CONNECTIVITY"),
+    Iteration("upload_error", "status=UPLOAD_ERROR")
+  )
+  fun testGetSyncStatus_withInitedLogStore_forceStatus_reportError_returnsForcedStatus() {
+    val syncStatusProvider = impl.getSyncStatus()
+    impl.initializeEventLogStore(logsCacheStore)
+    connectNetwork()
+    impl.reportUploadError()
+
+    impl.forceSyncStatus(syncStatus)
+    testCoroutineDispatchers.runCurrent()
+
+    // The forced status should overwrite the current manager's sync status state.
+    val syncStatus = monitorFactory.waitForNextSuccessfulResult(syncStatusProvider)
+    assertThat(syncStatus).isEqualTo(syncStatus)
+  }
+
+  @Test
+  @RunParameterized(
+    Iteration("initial_unknown", "status=INITIAL_UNKNOWN"),
+    Iteration("waiting_to_start_uploading", "status=WAITING_TO_START_UPLOADING"),
+    Iteration("data_uploading", "status=DATA_UPLOADING"),
+    Iteration("data_uploaded", "status=DATA_UPLOADED"),
+    Iteration("no_connectivity", "status=NO_CONNECTIVITY"),
+    Iteration("upload_error", "status=UPLOAD_ERROR")
+  )
+  fun testGetSyncStatus_initialState_resetStatus_returnsInitialUnknown() {
+    val syncStatusProvider = impl.getSyncStatus()
+    impl.forceSyncStatus(syncStatus)
+    testCoroutineDispatchers.runCurrent()
+
+    impl.resetForcedSyncStatus()
+    testCoroutineDispatchers.runCurrent()
+
+    // The original status should be returned.
+    val syncStatus = monitorFactory.waitForNextSuccessfulResult(syncStatusProvider)
+    assertThat(syncStatus).isEqualTo(INITIAL_UNKNOWN)
+  }
+
+  @Test
+  @RunParameterized(
+    Iteration("initial_unknown", "status=INITIAL_UNKNOWN"),
+    Iteration("waiting_to_start_uploading", "status=WAITING_TO_START_UPLOADING"),
+    Iteration("data_uploading", "status=DATA_UPLOADING"),
+    Iteration("data_uploaded", "status=DATA_UPLOADED"),
+    Iteration("no_connectivity", "status=NO_CONNECTIVITY"),
+    Iteration("upload_error", "status=UPLOAD_ERROR")
+  )
+  fun testGetSyncStatus_withInitedLogStore_resetStatus_noConnectivity_returnsNoConnectivity() {
+    val syncStatusProvider = impl.getSyncStatus()
+    impl.initializeEventLogStore(logsCacheStore)
+    disconnectNetwork()
+    queueEventLogForUploading(EVENT_LOG_0)
+    impl.forceSyncStatus(syncStatus)
+    testCoroutineDispatchers.runCurrent()
+
+    impl.resetForcedSyncStatus()
+    testCoroutineDispatchers.runCurrent()
+
+    // The original status should be returned.
+    val syncStatus = monitorFactory.waitForNextSuccessfulResult(syncStatusProvider)
+    assertThat(syncStatus).isEqualTo(NO_CONNECTIVITY)
+  }
+
+  @Test
+  @RunParameterized(
+    Iteration("initial_unknown", "status=INITIAL_UNKNOWN"),
+    Iteration("waiting_to_start_uploading", "status=WAITING_TO_START_UPLOADING"),
+    Iteration("data_uploading", "status=DATA_UPLOADING"),
+    Iteration("data_uploaded", "status=DATA_UPLOADED"),
+    Iteration("no_connectivity", "status=NO_CONNECTIVITY"),
+    Iteration("upload_error", "status=UPLOAD_ERROR")
+  )
+  fun testGetSyncStatus_withInitedLogStore_resetStatus_noEvents_returnsInitialUnknown() {
+    val syncStatusProvider = impl.getSyncStatus()
+    impl.initializeEventLogStore(logsCacheStore)
+    connectNetwork()
+    impl.forceSyncStatus(syncStatus)
+    testCoroutineDispatchers.runCurrent()
+
+    impl.resetForcedSyncStatus()
+    testCoroutineDispatchers.runCurrent()
+
+    // The original status should be returned.
+    val syncStatus = monitorFactory.waitForNextSuccessfulResult(syncStatusProvider)
+    assertThat(syncStatus).isEqualTo(INITIAL_UNKNOWN)
+  }
+
+  @Test
+  @RunParameterized(
+    Iteration("initial_unknown", "status=INITIAL_UNKNOWN"),
+    Iteration("waiting_to_start_uploading", "status=WAITING_TO_START_UPLOADING"),
+    Iteration("data_uploading", "status=DATA_UPLOADING"),
+    Iteration("data_uploaded", "status=DATA_UPLOADED"),
+    Iteration("no_connectivity", "status=NO_CONNECTIVITY"),
+    Iteration("upload_error", "status=UPLOAD_ERROR")
+  )
+  fun testGetSyncStatus_withInitedLogStore_resetStatus_withEvents_returnsWaitingToStartUploading() {
+    val syncStatusProvider = impl.getSyncStatus()
+    impl.initializeEventLogStore(logsCacheStore)
+    connectNetwork()
+    queueEventLogForUploading(EVENT_LOG_0)
+    queueEventLogForUploading(EVENT_LOG_1)
+    impl.forceSyncStatus(syncStatus)
+    testCoroutineDispatchers.runCurrent()
+
+    impl.resetForcedSyncStatus()
+    testCoroutineDispatchers.runCurrent()
+
+    // The original status should be returned.
+    val syncStatus = monitorFactory.waitForNextSuccessfulResult(syncStatusProvider)
+    assertThat(syncStatus).isEqualTo(WAITING_TO_START_UPLOADING)
+  }
+
+  @Test
+  @RunParameterized(
+    Iteration("initial_unknown", "status=INITIAL_UNKNOWN"),
+    Iteration("waiting_to_start_uploading", "status=WAITING_TO_START_UPLOADING"),
+    Iteration("data_uploading", "status=DATA_UPLOADING"),
+    Iteration("data_uploaded", "status=DATA_UPLOADED"),
+    Iteration("no_connectivity", "status=NO_CONNECTIVITY"),
+    Iteration("upload_error", "status=UPLOAD_ERROR")
+  )
+  fun testGetSyncStatus_withInitedLogStore_resetStatus_withEvents_allRemoved_returnsDataUploaded() {
+    val syncStatusProvider = impl.getSyncStatus()
+    impl.initializeEventLogStore(logsCacheStore)
+    connectNetwork()
+    queueEventLogForUploading(EVENT_LOG_0)
+    queueEventLogForUploading(EVENT_LOG_1)
+    moveEventLogToUploaded(EVENT_LOG_0)
+    moveEventLogToUploaded(EVENT_LOG_1)
+    impl.forceSyncStatus(syncStatus)
+    testCoroutineDispatchers.runCurrent()
+
+    impl.resetForcedSyncStatus()
+    testCoroutineDispatchers.runCurrent()
+
+    // The original status should be returned.
+    val syncStatus = monitorFactory.waitForNextSuccessfulResult(syncStatusProvider)
+    assertThat(syncStatus).isEqualTo(DATA_UPLOADED)
+  }
+
+  @Test
+  @RunParameterized(
+    Iteration("initial_unknown", "status=INITIAL_UNKNOWN"),
+    Iteration("waiting_to_start_uploading", "status=WAITING_TO_START_UPLOADING"),
+    Iteration("data_uploading", "status=DATA_UPLOADING"),
+    Iteration("data_uploaded", "status=DATA_UPLOADED"),
+    Iteration("no_connectivity", "status=NO_CONNECTIVITY"),
+    Iteration("upload_error", "status=UPLOAD_ERROR")
+  )
+  fun testGetSyncStatus_withInitedLogStore_resetStatus_reportUploadingStarted_returnsUploading() {
+    val syncStatusProvider = impl.getSyncStatus()
+    impl.initializeEventLogStore(logsCacheStore)
+    connectNetwork()
+    queueEventLogForUploading(EVENT_LOG_0)
+    impl.reportUploadingStarted()
+    impl.forceSyncStatus(syncStatus)
+    testCoroutineDispatchers.runCurrent()
+
+    impl.resetForcedSyncStatus()
+    testCoroutineDispatchers.runCurrent()
+
+    // The original status should be returned.
+    val syncStatus = monitorFactory.waitForNextSuccessfulResult(syncStatusProvider)
+    assertThat(syncStatus).isEqualTo(DATA_UPLOADING)
+  }
+
+  @Test
+  @RunParameterized(
+    Iteration("initial_unknown", "status=INITIAL_UNKNOWN"),
+    Iteration("waiting_to_start_uploading", "status=WAITING_TO_START_UPLOADING"),
+    Iteration("data_uploading", "status=DATA_UPLOADING"),
+    Iteration("data_uploaded", "status=DATA_UPLOADED"),
+    Iteration("no_connectivity", "status=NO_CONNECTIVITY"),
+    Iteration("upload_error", "status=UPLOAD_ERROR")
+  )
+  fun testGetSyncStatus_withInitedLogStore_resetStatus_reportUploadingEnded_returnsUploaded() {
+    val syncStatusProvider = impl.getSyncStatus()
+    impl.initializeEventLogStore(logsCacheStore)
+    connectNetwork()
+    queueEventLogForUploading(EVENT_LOG_0)
+    impl.reportUploadingStarted()
+    moveEventLogToUploaded(EVENT_LOG_0)
+    impl.reportUploadingEnded()
+    impl.forceSyncStatus(syncStatus)
+    testCoroutineDispatchers.runCurrent()
+
+    impl.resetForcedSyncStatus()
+    testCoroutineDispatchers.runCurrent()
+
+    // The original status should be returned.
+    val syncStatus = monitorFactory.waitForNextSuccessfulResult(syncStatusProvider)
+    assertThat(syncStatus).isEqualTo(DATA_UPLOADED)
+  }
+
+  @Test
+  @RunParameterized(
+    Iteration("initial_unknown", "status=INITIAL_UNKNOWN"),
+    Iteration("waiting_to_start_uploading", "status=WAITING_TO_START_UPLOADING"),
+    Iteration("data_uploading", "status=DATA_UPLOADING"),
+    Iteration("data_uploaded", "status=DATA_UPLOADED"),
+    Iteration("no_connectivity", "status=NO_CONNECTIVITY"),
+    Iteration("upload_error", "status=UPLOAD_ERROR")
+  )
+  fun testGetSyncStatus_withInitedLogStore_resetStatus_reportError_returnsUploadError() {
+    val syncStatusProvider = impl.getSyncStatus()
+    impl.initializeEventLogStore(logsCacheStore)
+    connectNetwork()
+    impl.reportUploadError()
+    impl.forceSyncStatus(syncStatus)
+    testCoroutineDispatchers.runCurrent()
+
+    impl.resetForcedSyncStatus()
+    testCoroutineDispatchers.runCurrent()
+
+    // The original status should be returned.
+    val syncStatus = monitorFactory.waitForNextSuccessfulResult(syncStatusProvider)
+    assertThat(syncStatus).isEqualTo(UPLOAD_ERROR)
+  }
+
+  @Test
+  fun testGetSyncStatuses_withForcedInitialUnknown_returnIncludesInitialUnknown() {
+    impl.forceSyncStatus(INITIAL_UNKNOWN)
+    testCoroutineDispatchers.runCurrent()
+
+    val statuses = impl.getSyncStatuses()
+
+    // The forced status should be included in the tracked statuses.
+    assertThat(statuses).contains(INITIAL_UNKNOWN)
+  }
+
+  @Test
+  fun testGetSyncStatuses_withForcedStartUploading_returnIncludesWaitingToStartUploading() {
+    impl.forceSyncStatus(WAITING_TO_START_UPLOADING)
+    testCoroutineDispatchers.runCurrent()
+
+    val statuses = impl.getSyncStatuses()
+
+    // The forced status should be included in the tracked statuses.
+    assertThat(statuses).contains(WAITING_TO_START_UPLOADING)
+  }
+
+  @Test
+  fun testGetSyncStatuses_withForcedDataUploading_returnIncludesDataUploading() {
+    impl.forceSyncStatus(DATA_UPLOADING)
+    testCoroutineDispatchers.runCurrent()
+
+    val statuses = impl.getSyncStatuses()
+
+    // The forced status should be included in the tracked statuses.
+    assertThat(statuses).contains(DATA_UPLOADING)
+  }
+
+  @Test
+  fun testGetSyncStatuses_withForcedDataUploaded_returnIncludesDataUploaded() {
+    impl.forceSyncStatus(DATA_UPLOADED)
+    testCoroutineDispatchers.runCurrent()
+
+    val statuses = impl.getSyncStatuses()
+
+    // The forced status should be included in the tracked statuses.
+    assertThat(statuses).contains(DATA_UPLOADED)
+  }
+
+  @Test
+  fun testGetSyncStatuses_withForcedNoConnectivity_returnIncludesNoConnectivity() {
+    impl.forceSyncStatus(NO_CONNECTIVITY)
+    testCoroutineDispatchers.runCurrent()
+
+    val statuses = impl.getSyncStatuses()
+
+    // The forced status should be included in the tracked statuses.
+    assertThat(statuses).contains(NO_CONNECTIVITY)
+  }
+
+  @Test
+  fun testGetSyncStatuses_withForcedUploadError_returnIncludesUploadError() {
+    impl.forceSyncStatus(UPLOAD_ERROR)
+    testCoroutineDispatchers.runCurrent()
+
+    val statuses = impl.getSyncStatuses()
+
+    // The forced status should be included in the tracked statuses.
+    assertThat(statuses).contains(UPLOAD_ERROR)
+  }
+
+  @Test
+  fun testGetSyncStatuses_initialState_returnsInitialUnknown() {
+    val syncStatuses = impl.getSyncStatuses()
+
+    assertThat(syncStatuses).containsExactly(INITIAL_UNKNOWN)
+  }
+
+  @Test
+  fun testGetSyncStatuses_withInitedLogStore_noConnectivity_returnsUnknownAndNoConnectivity() {
+    impl.initializeEventLogStore(logsCacheStore)
+    disconnectNetwork()
+    queueEventLogForUploading(EVENT_LOG_0)
+
+    val syncStatuses = impl.getSyncStatuses()
+
+    assertThat(syncStatuses).containsExactly(INITIAL_UNKNOWN, NO_CONNECTIVITY).inOrder()
+  }
+
+  @Test
+  fun testGetSyncStatuses_withInitedLogStore_noEvents_returnsUnknown() {
+    impl.initializeEventLogStore(logsCacheStore)
+    connectNetwork()
+
+    val syncStatuses = impl.getSyncStatuses()
+
+    assertThat(syncStatuses).containsExactly(INITIAL_UNKNOWN).inOrder()
+  }
+
+  @Test
+  fun testGetSyncStatuses_withInitedLogStore_withEvents_returnsSequenceUpToStartUploading() {
+    impl.initializeEventLogStore(logsCacheStore)
+    connectNetwork()
+    queueEventLogForUploading(EVENT_LOG_0)
+    queueEventLogForUploading(EVENT_LOG_1)
+
+    val syncStatuses = impl.getSyncStatuses()
+
+    // Note that the base manager will report multiple "waiting to start uploading" but the fake
+    // intentionally de-duplicates them since the status hasn't actually changed.
+    assertThat(syncStatuses).containsExactly(INITIAL_UNKNOWN, WAITING_TO_START_UPLOADING).inOrder()
+  }
+
+  @Test
+  fun testGetSyncStatuses_withInitedLogStore_withEvents_allRemoved_returnsSeqUpToDataUploaded() {
+    impl.initializeEventLogStore(logsCacheStore)
+    connectNetwork()
+    queueEventLogForUploading(EVENT_LOG_0)
+    queueEventLogForUploading(EVENT_LOG_1)
+    moveEventLogToUploaded(EVENT_LOG_0)
+    moveEventLogToUploaded(EVENT_LOG_1)
+
+    val syncStatuses = impl.getSyncStatuses()
+
+    assertThat(syncStatuses)
+      .containsExactly(INITIAL_UNKNOWN, WAITING_TO_START_UPLOADING, DATA_UPLOADED)
+      .inOrder()
+  }
+
+  @Test
+  fun testGetSyncStatuses_withInitedLogStore_reportUploadingStarted_returnsSequenceUpToUploading() {
+    impl.initializeEventLogStore(logsCacheStore)
+    connectNetwork()
+    queueEventLogForUploading(EVENT_LOG_0)
+    impl.reportUploadingStarted()
+    testCoroutineDispatchers.runCurrent()
+
+    val syncStatuses = impl.getSyncStatuses()
+
+    assertThat(syncStatuses)
+      .containsExactly(INITIAL_UNKNOWN, WAITING_TO_START_UPLOADING, DATA_UPLOADING)
+      .inOrder()
+  }
+
+  @Test
+  fun testGetSyncStatuses_withInitedLogStore_reportUploadingEnded_returnsSequenceUpToUploaded() {
+    impl.initializeEventLogStore(logsCacheStore)
+    connectNetwork()
+    queueEventLogForUploading(EVENT_LOG_0)
+    impl.reportUploadingStarted()
+    testCoroutineDispatchers.runCurrent()
+    moveEventLogToUploaded(EVENT_LOG_0)
+    impl.reportUploadingEnded()
+    testCoroutineDispatchers.runCurrent()
+
+    val syncStatuses = impl.getSyncStatuses()
+
+    assertThat(syncStatuses)
+      .containsExactly(INITIAL_UNKNOWN, WAITING_TO_START_UPLOADING, DATA_UPLOADING, DATA_UPLOADED)
+      .inOrder()
+  }
+
+  @Test
+  fun testGetSyncStatuses_withInitedLogStore_reportError_returnsSequenceUpToUploadError() {
+    impl.initializeEventLogStore(logsCacheStore)
+    connectNetwork()
+    queueEventLogForUploading(EVENT_LOG_0)
+    impl.reportUploadingStarted()
+    testCoroutineDispatchers.runCurrent()
+    impl.reportUploadError()
+    testCoroutineDispatchers.runCurrent()
+
+    val syncStatuses = impl.getSyncStatuses()
+
+    assertThat(syncStatuses)
+      .containsExactly(INITIAL_UNKNOWN, WAITING_TO_START_UPLOADING, DATA_UPLOADING, UPLOAD_ERROR)
+      .inOrder()
+  }
+
+  @Test
+  @RunParameterized(
+    Iteration("initial_unknown", "status=INITIAL_UNKNOWN"),
+    Iteration("waiting_to_start_uploading", "status=WAITING_TO_START_UPLOADING"),
+    Iteration("data_uploading", "status=DATA_UPLOADING"),
+    Iteration("data_uploaded", "status=DATA_UPLOADED"),
+    Iteration("no_connectivity", "status=NO_CONNECTIVITY"),
+    Iteration("upload_error", "status=UPLOAD_ERROR")
+  )
+  fun testGetSyncStatuses_initialState_forceStatus_returnsWithForcedStatus() {
+    impl.forceSyncStatus(syncStatus)
+    testCoroutineDispatchers.runCurrent()
+
+    val syncStatuses = impl.getSyncStatuses()
+
+    // The most recent tracked status should be the forced one.
+    assertThat(syncStatuses.last()).isEqualTo(syncStatus)
+  }
+
+  @Test
+  @RunParameterized(
+    Iteration("initial_unknown", "status=INITIAL_UNKNOWN"),
+    Iteration("waiting_to_start_uploading", "status=WAITING_TO_START_UPLOADING"),
+    Iteration("data_uploading", "status=DATA_UPLOADING"),
+    Iteration("data_uploaded", "status=DATA_UPLOADED"),
+    Iteration("no_connectivity", "status=NO_CONNECTIVITY"),
+    Iteration("upload_error", "status=UPLOAD_ERROR")
+  )
+  fun testGetSyncStatuses_withInitedLogStore_forceStatus_noConnectivity_returnsWithForcedStatus() {
+    impl.initializeEventLogStore(logsCacheStore)
+    disconnectNetwork()
+    impl.forceSyncStatus(syncStatus)
+    testCoroutineDispatchers.runCurrent()
+
+    val syncStatuses = impl.getSyncStatuses()
+
+    // The most recent tracked status should be the forced one.
+    assertThat(syncStatuses.last()).isEqualTo(syncStatus)
+  }
+
+  @Test
+  @RunParameterized(
+    Iteration("initial_unknown", "status=INITIAL_UNKNOWN"),
+    Iteration("waiting_to_start_uploading", "status=WAITING_TO_START_UPLOADING"),
+    Iteration("data_uploading", "status=DATA_UPLOADING"),
+    Iteration("data_uploaded", "status=DATA_UPLOADED"),
+    Iteration("no_connectivity", "status=NO_CONNECTIVITY"),
+    Iteration("upload_error", "status=UPLOAD_ERROR")
+  )
+  fun testGetSyncStatuses_withInitedLogStore_forceStatus_noEvents_returnsWithForcedStatus() {
+    impl.initializeEventLogStore(logsCacheStore)
+    connectNetwork()
+    impl.forceSyncStatus(syncStatus)
+    testCoroutineDispatchers.runCurrent()
+
+    val syncStatuses = impl.getSyncStatuses()
+
+    // The most recent tracked status should be the forced one.
+    assertThat(syncStatuses.last()).isEqualTo(syncStatus)
+  }
+
+  @Test
+  @RunParameterized(
+    Iteration("initial_unknown", "status=INITIAL_UNKNOWN"),
+    Iteration("waiting_to_start_uploading", "status=WAITING_TO_START_UPLOADING"),
+    Iteration("data_uploading", "status=DATA_UPLOADING"),
+    Iteration("data_uploaded", "status=DATA_UPLOADED"),
+    Iteration("no_connectivity", "status=NO_CONNECTIVITY"),
+    Iteration("upload_error", "status=UPLOAD_ERROR")
+  )
+  fun testGetSyncStatuses_withInitedLogStore_forceStatus_withEvents_returnsWithForcedStatus() {
+    impl.initializeEventLogStore(logsCacheStore)
+    connectNetwork()
+    queueEventLogForUploading(EVENT_LOG_0)
+    queueEventLogForUploading(EVENT_LOG_1)
+    impl.forceSyncStatus(syncStatus)
+    testCoroutineDispatchers.runCurrent()
+
+    val syncStatuses = impl.getSyncStatuses()
+
+    // The most recent tracked status should be the forced one.
+    assertThat(syncStatuses.last()).isEqualTo(syncStatus)
+  }
+
+  @Test
+  @RunParameterized(
+    Iteration("initial_unknown", "status=INITIAL_UNKNOWN"),
+    Iteration("waiting_to_start_uploading", "status=WAITING_TO_START_UPLOADING"),
+    Iteration("data_uploading", "status=DATA_UPLOADING"),
+    Iteration("data_uploaded", "status=DATA_UPLOADED"),
+    Iteration("no_connectivity", "status=NO_CONNECTIVITY"),
+    Iteration("upload_error", "status=UPLOAD_ERROR")
+  )
+  fun testGetSyncStatuses_withLogStore_forceStatus_withEvents_allRemoved_returnsWithForcedStatus() {
+    impl.initializeEventLogStore(logsCacheStore)
+    connectNetwork()
+    queueEventLogForUploading(EVENT_LOG_0)
+    queueEventLogForUploading(EVENT_LOG_1)
+    moveEventLogToUploaded(EVENT_LOG_0)
+    moveEventLogToUploaded(EVENT_LOG_1)
+    impl.forceSyncStatus(syncStatus)
+    testCoroutineDispatchers.runCurrent()
+
+    val syncStatuses = impl.getSyncStatuses()
+
+    // The most recent tracked status should be the forced one.
+    assertThat(syncStatuses.last()).isEqualTo(syncStatus)
+  }
+
+  @Test
+  @RunParameterized(
+    Iteration("initial_unknown", "status=INITIAL_UNKNOWN"),
+    Iteration("waiting_to_start_uploading", "status=WAITING_TO_START_UPLOADING"),
+    Iteration("data_uploading", "status=DATA_UPLOADING"),
+    Iteration("data_uploaded", "status=DATA_UPLOADED"),
+    Iteration("no_connectivity", "status=NO_CONNECTIVITY"),
+    Iteration("upload_error", "status=UPLOAD_ERROR")
+  )
+  fun testGetSyncStatuses_withLogStore_forceStatus_reportUploading_returnsWithForcedStatus() {
+    impl.initializeEventLogStore(logsCacheStore)
+    connectNetwork()
+    queueEventLogForUploading(EVENT_LOG_0)
+    impl.reportUploadingStarted()
+    testCoroutineDispatchers.runCurrent()
+    impl.forceSyncStatus(syncStatus)
+    testCoroutineDispatchers.runCurrent()
+
+    val syncStatuses = impl.getSyncStatuses()
+
+    // The most recent tracked status should be the forced one.
+    assertThat(syncStatuses.last()).isEqualTo(syncStatus)
+  }
+
+  @Test
+  @RunParameterized(
+    Iteration("initial_unknown", "status=INITIAL_UNKNOWN"),
+    Iteration("waiting_to_start_uploading", "status=WAITING_TO_START_UPLOADING"),
+    Iteration("data_uploading", "status=DATA_UPLOADING"),
+    Iteration("data_uploaded", "status=DATA_UPLOADED"),
+    Iteration("no_connectivity", "status=NO_CONNECTIVITY"),
+    Iteration("upload_error", "status=UPLOAD_ERROR")
+  )
+  fun testGetSyncStatuses_withLogStore_forceStatus_reportUploadingEnded_returnsWithForcedStatus() {
+    impl.initializeEventLogStore(logsCacheStore)
+    connectNetwork()
+    queueEventLogForUploading(EVENT_LOG_0)
+    impl.reportUploadingStarted()
+    testCoroutineDispatchers.runCurrent()
+    moveEventLogToUploaded(EVENT_LOG_0)
+    impl.reportUploadingEnded()
+    testCoroutineDispatchers.runCurrent()
+    impl.forceSyncStatus(syncStatus)
+    testCoroutineDispatchers.runCurrent()
+
+    val syncStatuses = impl.getSyncStatuses()
+
+    // The most recent tracked status should be the forced one.
+    assertThat(syncStatuses.last()).isEqualTo(syncStatus)
+  }
+
+  @Test
+  @RunParameterized(
+    Iteration("initial_unknown", "status=INITIAL_UNKNOWN"),
+    Iteration("waiting_to_start_uploading", "status=WAITING_TO_START_UPLOADING"),
+    Iteration("data_uploading", "status=DATA_UPLOADING"),
+    Iteration("data_uploaded", "status=DATA_UPLOADED"),
+    Iteration("no_connectivity", "status=NO_CONNECTIVITY"),
+    Iteration("upload_error", "status=UPLOAD_ERROR")
+  )
+  fun testGetSyncStatuses_withInitedLogStore_forceStatus_reportError_returnsWithForcedStatus() {
+    impl.initializeEventLogStore(logsCacheStore)
+    connectNetwork()
+    queueEventLogForUploading(EVENT_LOG_0)
+    impl.reportUploadingStarted()
+    testCoroutineDispatchers.runCurrent()
+    impl.reportUploadError()
+    testCoroutineDispatchers.runCurrent()
+    impl.forceSyncStatus(syncStatus)
+    testCoroutineDispatchers.runCurrent()
+
+    val syncStatuses = impl.getSyncStatuses()
+
+    // The most recent tracked status should be the forced one.
+    assertThat(syncStatuses.last()).isEqualTo(syncStatus)
+  }
+
+  private fun setUpTestApplicationComponent() {
+    ApplicationProvider.getApplicationContext<TestApplication>().inject(this)
+  }
+
+  // TODO(#89): Move this to a common test application component.
+  @Module
+  class TestModule {
+    @Provides
+    @Singleton
+    fun provideContext(application: Application): Context {
+      return application
+    }
+  }
+
+  // TODO(#89): Move this to a common test application component.
+  @Singleton
+  @Component(
+    modules = [
+      TestModule::class, LogStorageModule::class, NetworkConnectionUtilDebugModule::class,
+      TestLogReportingModule::class, LoggerModule::class, TestDispatcherModule::class,
+      LocaleProdModule::class, FakeOppiaClockModule::class, RobolectricModule::class
+    ]
+  )
+  interface TestApplicationComponent : DataProvidersInjector {
+    @Component.Builder
+    interface Builder {
+      @BindsInstance
+      fun setApplication(application: Application): Builder
+      fun build(): TestApplicationComponent
+    }
+
+    fun inject(test: TestSyncStatusManagerTest)
+  }
+
+  class TestApplication : Application(), DataProvidersInjectorProvider {
+    private val component: TestApplicationComponent by lazy {
+      DaggerTestSyncStatusManagerTest_TestApplicationComponent.builder()
+        .setApplication(this)
+        .build()
+    }
+
+    fun inject(test: TestSyncStatusManagerTest) {
+      component.inject(test)
+    }
+
+    override fun getDataProvidersInjector(): DataProvidersInjector = component
+  }
+
+  private companion object {
+    private const val EVENT_LOG_TIMESTAMP_0 = 1556061720000
+    private const val EVENT_LOG_TIMESTAMP_1 = 1556094120000
+
+    private val OPEN_HOME_CONTEXT = EventLog.Context.newBuilder().apply { openHome = true }.build()
+    private val EVENT_LOG_0 = createEventLog(EVENT_LOG_TIMESTAMP_0, OPEN_HOME_CONTEXT)
+    private val EVENT_LOG_1 = createEventLog(EVENT_LOG_TIMESTAMP_1, OPEN_HOME_CONTEXT)
+
+    private fun createEventLog(timestamp: Long, context: EventLog.Context): EventLog {
+      return EventLog.newBuilder().apply {
+        this.timestamp = timestamp
+        this.priority = EventLog.Priority.ESSENTIAL
+        this.context = context
+      }.build()
+    }
+  }
+}
diff --git a/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel b/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel
index e104914a53d..bf171a323fc 100644
--- a/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel
+++ b/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel
@@ -192,6 +192,8 @@ kt_android_library(
     ],
     visibility = ["//:oppia_api_visibility"],
     deps = [
+        "//data/src/main/java/org/oppia/android/data/persistence:cache_store",
+        "//model/src/main/proto:event_logger_java_proto_lite",
         "//utility/src/main/java/org/oppia/android/util/data:data_provider",
     ],
 )
@@ -204,8 +206,11 @@ kt_android_library(
     visibility = ["//testing/src/main/java/org/oppia/android/testing/logging:__pkg__"],
     deps = [
         ":sync_status_manager",
+        "//model/src/main/proto:event_logger_java_proto_lite",
         "//utility/src/main/java/org/oppia/android/util/data:async_data_subscription_manager",
         "//utility/src/main/java/org/oppia/android/util/data:data_providers",
+        "//utility/src/main/java/org/oppia/android/util/networking:network_connection_util",
+        "//utility/src/main/java/org/oppia/android/util/threading:atomic_enum",
     ],
 )
 
diff --git a/utility/src/main/java/org/oppia/android/util/logging/SyncStatusManager.kt b/utility/src/main/java/org/oppia/android/util/logging/SyncStatusManager.kt
index 6807860cc06..3f8f4a62b6a 100644
--- a/utility/src/main/java/org/oppia/android/util/logging/SyncStatusManager.kt
+++ b/utility/src/main/java/org/oppia/android/util/logging/SyncStatusManager.kt
@@ -1,5 +1,7 @@
 package org.oppia.android.util.logging
 
+import org.oppia.android.app.model.OppiaEventLogs
+import org.oppia.android.data.persistence.PersistentCacheStore
 import org.oppia.android.util.data.DataProvider
 
 /**
@@ -9,24 +11,49 @@ import org.oppia.android.util.data.DataProvider
  */
 interface SyncStatusManager {
   /**
-   * Returns the current [SyncStatus] of the device.
+   * Returns the current [SyncStatus] of the device, as computed by current system conditions (such
+   * as network connectivity). The returned [DataProvider] will generally automatically update when
+   * a new status is known.
    *
-   * This returns a different [DataProvider] for each call, but they will be updated due to changes
-   * to the sync status via [setSyncStatus].
+   * Note one exception: when network connectivity changes, this will not result in a change to the
+   * status unless other status change is reported (such as via [reportUploadingStarted], or the
+   * other similar functions below).
    */
   fun getSyncStatus(): DataProvider<SyncStatus>
 
   /**
-   * Changes the current [SyncStatusManager.SyncStatus] of the device to [syncStatus] and notifies
-   * the data provider returned by [getSyncStatus] of this change.
+   * Initializes this manager with the specified [eventLogStore] that is assumed to track all events
+   * for the lifetime of the application.
+   *
+   * This function must be called in order for [getSyncStatus] to behave correctly, and it must not
+   * be called more than once. It can be called before or after [getSyncStatus].
    */
-  fun setSyncStatus(syncStatus: SyncStatus)
+  fun initializeEventLogStore(eventLogStore: PersistentCacheStore<OppiaEventLogs>)
+
+  /** Indicates that upstream code is beginning an event upload operation. */
+  fun reportUploadingStarted()
+
+  /** Indicates that upstream code has ended an event upload operation. */
+  fun reportUploadingEnded()
+
+  /** Indicates that upstream code encountered an upload error while trying to upload events. */
+  fun reportUploadError()
 
   /** The sync status values corresponding to different stages of uploading logging analytics. */
   enum class SyncStatus {
-    /** The initial state where the current upload state is unknown. */
+    /**
+     * The initial state where the current upload state is unknown. This should be interpreted to
+     * mean that events are waiting to be logged until a more specific status is received or
+     * determined.
+     */
     INITIAL_UNKNOWN,
 
+    /**
+     * Indicates that there are events waiting to be uploaded, but the operation hasn't started yet
+     * (either manually or via the automatic background uploader).
+     */
+    WAITING_TO_START_UPLOADING,
+
     /** Indicates that analytics are currently being uploaded. */
     DATA_UPLOADING,
 
@@ -39,13 +66,16 @@ interface SyncStatusManager {
     /**
      * Indicates that the network is currently unavailable and that logs will be attempted to be
      * uploaded once connectivity resumes.
+     *
+     * Note that this will take priority over all other sync statuses until network connectivity is
+     * restored, including [UPLOAD_ERROR].
      */
     NO_CONNECTIVITY,
 
     /**
-     * Indicates a network error was encountered during analytics upload, and the logs may be
+     * Indicates an unresolvable error was encountered during analytics upload, and the logs may be
      * attempted to be re-uploaded at a later time.
      */
-    NETWORK_ERROR
+    UPLOAD_ERROR
   }
 }
diff --git a/utility/src/main/java/org/oppia/android/util/logging/SyncStatusManagerImpl.kt b/utility/src/main/java/org/oppia/android/util/logging/SyncStatusManagerImpl.kt
index 91f4edb8251..0c8cfedeb32 100644
--- a/utility/src/main/java/org/oppia/android/util/logging/SyncStatusManagerImpl.kt
+++ b/utility/src/main/java/org/oppia/android/util/logging/SyncStatusManagerImpl.kt
@@ -1,26 +1,107 @@
 package org.oppia.android.util.logging
 
-import kotlinx.coroutines.flow.MutableStateFlow
+import org.oppia.android.app.model.OppiaEventLogs
+import org.oppia.android.data.persistence.PersistentCacheStore
+import org.oppia.android.util.data.AsyncDataSubscriptionManager
+import org.oppia.android.util.data.AsyncResult
 import org.oppia.android.util.data.DataProvider
 import org.oppia.android.util.data.DataProviders
+import org.oppia.android.util.data.DataProviders.Companion.transformNested
 import org.oppia.android.util.logging.SyncStatusManager.SyncStatus
+import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.DATA_UPLOADED
+import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.DATA_UPLOADING
+import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.INITIAL_UNKNOWN
+import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.NO_CONNECTIVITY
+import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.UPLOAD_ERROR
+import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.WAITING_TO_START_UPLOADING
+import org.oppia.android.util.networking.NetworkConnectionUtil
+import org.oppia.android.util.networking.NetworkConnectionUtil.ProdConnectionStatus.NONE
+import org.oppia.android.util.threading.AtomicEnum
 import javax.inject.Inject
 import javax.inject.Singleton
 
 private const val SYNC_STATUS_PROVIDER_ID = "SyncStatusManagerImpl.sync_status"
+private const val DEFAULT_EVENT_LOG_PROVIDER_ID = "SyncStatusManagerImpl.default_event_logs"
 
 /** Manager for handling the sync status of the device during log upload to the remote service.*/
 @Singleton
 class SyncStatusManagerImpl @Inject constructor(
-  private val dataProviders: DataProviders
+  private val dataProviders: DataProviders,
+  private val networkConnectionUtil: NetworkConnectionUtil,
+  private val asyncDataSubscriptionManager: AsyncDataSubscriptionManager
 ) : SyncStatusManager {
-  private val syncStatusFlow = MutableStateFlow(SyncStatus.INITIAL_UNKNOWN)
+  private var eventLogStore: PersistentCacheStore<OppiaEventLogs>? = null
+  private val eventLogsDataProvider: DataProvider<OppiaEventLogs> get() {
+    return eventLogStore ?: dataProviders.createInMemoryDataProvider(
+      DEFAULT_EVENT_LOG_PROVIDER_ID, OppiaEventLogs::getDefaultInstance
+    )
+  }
+  private val configurableSyncStatus by lazy {
+    eventLogsDataProvider.transformNested(SYNC_STATUS_PROVIDER_ID) {
+      AsyncResult.Success(INITIAL_UNKNOWN)
+    }
+  }
+  private val transientState = AtomicEnum.create(TransientState.NOT_UPLOADING)
+
+  override fun getSyncStatus() = configurableSyncStatus
+
+  override fun initializeEventLogStore(eventLogStore: PersistentCacheStore<OppiaEventLogs>) {
+    check(this.eventLogStore == null) { "Attempting to initialize the log store a second time." }
+    this.eventLogStore = eventLogStore
+    // Note that changing the base provider automatically notifies subscribers, so no need to do
+    // that again.
+    configurableSyncStatus.setBaseDataProvider(eventLogsDataProvider) { computeSyncStatus(it) }
+  }
+
+  override fun reportUploadingStarted() {
+    reportStatusChange(TransientState.UPLOADING)
+  }
 
-  override fun getSyncStatus(): DataProvider<SyncStatus> = dataProviders.run {
-    syncStatusFlow.convertToAutomaticDataProvider(SYNC_STATUS_PROVIDER_ID)
+  override fun reportUploadingEnded() {
+    reportStatusChange(TransientState.NOT_UPLOADING)
   }
 
-  override fun setSyncStatus(syncStatus: SyncStatus) {
-    check(syncStatusFlow.tryEmit(syncStatus)) { "Failed to update sync status to $syncStatus" }
+  override fun reportUploadError() {
+    reportStatusChange(TransientState.UPLOAD_FAILED)
+  }
+
+  private fun reportStatusChange(newStatus: TransientState) {
+    transientState.value = newStatus
+    asyncDataSubscriptionManager.notifyChangeAsync(SYNC_STATUS_PROVIDER_ID)
+  }
+
+  private fun computeSyncStatus(oppiaEventLogs: OppiaEventLogs): AsyncResult<SyncStatus> {
+    // Current network activity only matters when event logs change (since that's when the decision
+    // to upload/cache events takes place).
+    val hasConnectivity = networkConnectionUtil.getCurrentConnectionStatus() != NONE
+    val hasEventsToUpload = oppiaEventLogs.eventLogsToUploadList.isNotEmpty()
+    val hasUploadedEvents = oppiaEventLogs.uploadedEventLogsList.isNotEmpty()
+    return when (transientState.value) {
+      TransientState.NOT_UPLOADING -> when {
+        hasEventsToUpload -> if (hasConnectivity) WAITING_TO_START_UPLOADING else NO_CONNECTIVITY
+        hasUploadedEvents -> DATA_UPLOADED
+        else -> INITIAL_UNKNOWN // Nothing has been uploaded yet.
+      }
+      TransientState.UPLOADING -> if (hasConnectivity) DATA_UPLOADING else NO_CONNECTIVITY
+      TransientState.UPLOAD_FAILED -> if (hasConnectivity) UPLOAD_ERROR else NO_CONNECTIVITY
+    }.let { AsyncResult.Success(it) }
+  }
+
+  /**
+   * Represents transient state that can be explicitly indicated by callers that directly manage
+   * event caching & uploading.
+   */
+  private enum class TransientState {
+    /** Indicates that upstream code is not currently uploading events. */
+    NOT_UPLOADING,
+
+    /** Indicates that upstream code is currently uploading events. */
+    UPLOADING,
+
+    /**
+     * Indicates that upstream code has failed when trying to upload events due to an unresolvable
+     * error.
+     */
+    UPLOAD_FAILED
   }
 }
diff --git a/utility/src/main/java/org/oppia/android/util/platformparameter/PlatformParameterConstants.kt b/utility/src/main/java/org/oppia/android/util/platformparameter/PlatformParameterConstants.kt
index 1d04df9960e..17726536667 100644
--- a/utility/src/main/java/org/oppia/android/util/platformparameter/PlatformParameterConstants.kt
+++ b/utility/src/main/java/org/oppia/android/util/platformparameter/PlatformParameterConstants.kt
@@ -105,11 +105,12 @@ annotation class EnableLearnerStudyAnalytics
  */
 const val LEARNER_STUDY_ANALYTICS = "learner_study_analytics"
 
+// TODO: Revert this.
 /**
  * Default value of the platform parameter that controls the visibility of [ProfileAndDeviceIdActivity]
  * and working of learner study related analytics logging.
  */
-const val LEARNER_STUDY_ANALYTICS_DEFAULT_VALUE = false
+const val LEARNER_STUDY_ANALYTICS_DEFAULT_VALUE = true
 
 /**
  * Qualifier for the platform parameter that controls whether to cache LaTeX rendering using Glide.
diff --git a/utility/src/main/java/org/oppia/android/util/threading/AtomicEnum.kt b/utility/src/main/java/org/oppia/android/util/threading/AtomicEnum.kt
new file mode 100644
index 00000000000..8a97d527419
--- /dev/null
+++ b/utility/src/main/java/org/oppia/android/util/threading/AtomicEnum.kt
@@ -0,0 +1,45 @@
+package org.oppia.android.util.threading
+
+import java.util.concurrent.atomic.AtomicInteger
+
+// TODO: Remove this class in favor of AtomicReference? Remove regex pattern for this file's test, too.
+/**
+ * TODO: Finish.
+ */
+class AtomicEnum<E : Enum<E>> private constructor(
+  private val initialValue: E,
+  private val constants: Map<Int, E>
+) {
+  private val backingAtomic by lazy { AtomicInteger(initialValue.toValidOrdinal()) }
+
+  /** TODO: Finish. */
+  var value: E
+    set(value) = backingAtomic.set(value.toValidOrdinal())
+    get() = backingAtomic.get().toValidConstant()
+
+  /** TODO: Finish. */
+  fun getAndSet(value: E): E = backingAtomic.getAndSet(value.toValidOrdinal()).toValidConstant()
+
+  private fun E.toValidOrdinal(): Int {
+    return ordinal.also {
+      require(it in constants) {
+        "Constant is not in the supported list of constants: $this (per $constants)."
+      }
+    }
+  }
+
+  // It's safe to use getValue() since enum constants are verified when set.
+  private fun Int.toValidConstant(): E = constants.getValue(this)
+
+  companion object {
+    /** TODO: Finish. */
+    inline fun <reified E : Enum<E>> create(initial: E): AtomicEnum<E> =
+      create(initial, enumValues<E>().asIterable())
+
+    /** TODO: Finish. */
+    fun <E : Enum<E>> create(initial: E, possibilities: Iterable<E>): AtomicEnum<E> {
+      require(initial in possibilities) { "Possibilities don't include initial value: $initial." }
+      return AtomicEnum(initial, possibilities.associateBy { it.ordinal })
+    }
+  }
+}
diff --git a/utility/src/main/java/org/oppia/android/util/threading/BUILD.bazel b/utility/src/main/java/org/oppia/android/util/threading/BUILD.bazel
index bb5b44721bc..90b63c0a706 100644
--- a/utility/src/main/java/org/oppia/android/util/threading/BUILD.bazel
+++ b/utility/src/main/java/org/oppia/android/util/threading/BUILD.bazel
@@ -3,7 +3,7 @@ General purpose utilities for multi-threading and concurrency.
 """
 
 load("@dagger//:workspace_defs.bzl", "dagger_rules")
-load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library")
+load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library", "kt_jvm_library")
 
 kt_android_library(
     name = "annotations",
@@ -17,6 +17,14 @@ kt_android_library(
     ],
 )
 
+kt_jvm_library(
+    name = "atomic_enum",
+    srcs = [
+        "AtomicEnum.kt",
+    ],
+    visibility = ["//:oppia_api_visibility"],
+)
+
 kt_android_library(
     name = "dispatcher_injector",
     srcs = [
diff --git a/utility/src/test/java/org/oppia/android/util/logging/BUILD.bazel b/utility/src/test/java/org/oppia/android/util/logging/BUILD.bazel
index c0debe33fea..46094493ecf 100644
--- a/utility/src/test/java/org/oppia/android/util/logging/BUILD.bazel
+++ b/utility/src/test/java/org/oppia/android/util/logging/BUILD.bazel
@@ -3,8 +3,26 @@ Tests for logging utilities.
 """
 
 load("@dagger//:workspace_defs.bzl", "dagger_rules")
+load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library")
 load("//:oppia_android_test.bzl", "oppia_android_test")
 
+kt_android_library(
+    name = "sync_status_manager_test_base",
+    testonly = True,
+    srcs = ["SyncStatusManagerTestBase.kt"],
+    visibility = [
+        "//testing/src/test/java/org/oppia/android/testing/logging:__pkg__",
+    ],
+    deps = [
+        "//testing",
+        "//testing/src/main/java/org/oppia/android/testing/data:data_provider_test_monitor",
+        "//testing/src/main/java/org/oppia/android/testing/networking:network_connection_test_util",
+        "//third_party:com_google_truth_truth",
+        "//third_party:junit_junit",
+        "//utility/src/main/java/org/oppia/android/util/logging:sync_status_manager",
+    ],
+)
+
 oppia_android_test(
     name = "EventBundleCreatorTest",
     srcs = ["EventBundleCreatorTest.kt"],
@@ -106,6 +124,7 @@ oppia_android_test(
     test_manifest = "//utility:test_manifest",
     deps = [
         ":dagger",
+        ":sync_status_manager_test_base",
         "//testing",
         "//testing/src/main/java/org/oppia/android/testing/data:data_provider_test_monitor",
         "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module",
diff --git a/utility/src/test/java/org/oppia/android/util/logging/SyncStatusManagerImplTest.kt b/utility/src/test/java/org/oppia/android/util/logging/SyncStatusManagerImplTest.kt
index d4d9693a6e0..52d32d11f2b 100644
--- a/utility/src/test/java/org/oppia/android/util/logging/SyncStatusManagerImplTest.kt
+++ b/utility/src/test/java/org/oppia/android/util/logging/SyncStatusManagerImplTest.kt
@@ -4,27 +4,24 @@ import android.app.Application
 import android.content.Context
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.google.common.truth.Truth.assertThat
 import dagger.BindsInstance
 import dagger.Component
 import dagger.Module
 import dagger.Provides
+import kotlinx.coroutines.CoroutineDispatcher
 import org.junit.Before
-import org.junit.Test
 import org.junit.runner.RunWith
+import org.oppia.android.data.persistence.PersistentCacheStore
 import org.oppia.android.testing.TestLogReportingModule
 import org.oppia.android.testing.data.DataProviderTestMonitor
+import org.oppia.android.testing.networking.NetworkConnectionTestUtil
 import org.oppia.android.testing.robolectric.RobolectricModule
+import org.oppia.android.testing.threading.TestCoroutineDispatchers
 import org.oppia.android.testing.threading.TestDispatcherModule
 import org.oppia.android.testing.time.FakeOppiaClockModule
 import org.oppia.android.util.data.DataProvidersInjector
 import org.oppia.android.util.data.DataProvidersInjectorProvider
 import org.oppia.android.util.locale.LocaleProdModule
-import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.DATA_UPLOADED
-import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.DATA_UPLOADING
-import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.INITIAL_UNKNOWN
-import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.NETWORK_ERROR
-import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.NO_CONNECTIVITY
 import org.oppia.android.util.networking.NetworkConnectionUtilDebugModule
 import org.oppia.android.util.platformparameter.ENABLE_LANGUAGE_SELECTION_UI_DEFAULT_VALUE
 import org.oppia.android.util.platformparameter.EnableLanguageSelectionUi
@@ -34,6 +31,7 @@ import org.oppia.android.util.platformparameter.SPLASH_SCREEN_WELCOME_MSG_DEFAUL
 import org.oppia.android.util.platformparameter.SYNC_UP_WORKER_TIME_PERIOD_IN_HOURS_DEFAULT_VALUE
 import org.oppia.android.util.platformparameter.SplashScreenWelcomeMsg
 import org.oppia.android.util.platformparameter.SyncUpWorkerTimePeriodHours
+import org.oppia.android.util.threading.BackgroundDispatcher
 import org.robolectric.annotation.Config
 import org.robolectric.annotation.LooperMode
 import javax.inject.Inject
@@ -45,87 +43,22 @@ import javax.inject.Singleton
 @RunWith(AndroidJUnit4::class)
 @LooperMode(LooperMode.Mode.PAUSED)
 @Config(application = SyncStatusManagerImplTest.TestApplication::class)
-class SyncStatusManagerImplTest {
-  @Inject lateinit var syncStatusManager: SyncStatusManager
-  @Inject lateinit var monitorFactory: DataProviderTestMonitor.Factory
+class SyncStatusManagerImplTest : SyncStatusManagerTestBase() {
+  @Inject override lateinit var impl: SyncStatusManager
+  @Inject override lateinit var monitorFactory: DataProviderTestMonitor.Factory
+  @Inject override lateinit var persistentCacheStoreFactory: PersistentCacheStore.Factory
+  @Inject override lateinit var networkConnectionTestUtil: NetworkConnectionTestUtil
+  @Inject override lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
+  @field:[Inject BackgroundDispatcher]
+  override lateinit var backgroundDispatcher: CoroutineDispatcher
 
   @Before
   fun setUp() {
     setUpTestApplicationComponent()
   }
 
-  @Test
-  fun testGetSyncStatus_initialState_returnsUnknown() {
-    val syncStatusProvider = syncStatusManager.getSyncStatus()
-
-    val syncStatus = monitorFactory.waitForNextSuccessfulResult(syncStatusProvider)
-    assertThat(syncStatus).isEqualTo(INITIAL_UNKNOWN)
-  }
-
-  @Test
-  fun testGetSyncStatus_setSyncStatus_toDataUploading_returnsUploading() {
-    val syncStatusProvider = syncStatusManager.getSyncStatus()
-
-    syncStatusManager.setSyncStatus(DATA_UPLOADING)
-
-    val syncStatus = monitorFactory.waitForNextSuccessfulResult(syncStatusProvider)
-    assertThat(syncStatus).isEqualTo(DATA_UPLOADING)
-  }
-
-  @Test
-  fun testGetSyncStatus_setSyncStatus_toDataUploaded_returnsUploaded() {
-    val syncStatusProvider = syncStatusManager.getSyncStatus()
-
-    syncStatusManager.setSyncStatus(DATA_UPLOADED)
-
-    val syncStatus = monitorFactory.waitForNextSuccessfulResult(syncStatusProvider)
-    assertThat(syncStatus).isEqualTo(DATA_UPLOADED)
-  }
-
-  @Test
-  fun testGetSyncStatus_setSyncStatus_toNoConnectivity_returnsNoConnectivity() {
-    val syncStatusProvider = syncStatusManager.getSyncStatus()
-
-    syncStatusManager.setSyncStatus(NO_CONNECTIVITY)
-
-    val syncStatus = monitorFactory.waitForNextSuccessfulResult(syncStatusProvider)
-    assertThat(syncStatus).isEqualTo(NO_CONNECTIVITY)
-  }
-
-  @Test
-  fun testGetSyncStatus_setSyncStatus_toNetworkError_returnsNetworkError() {
-    val syncStatusProvider = syncStatusManager.getSyncStatus()
-
-    syncStatusManager.setSyncStatus(NETWORK_ERROR)
-
-    val syncStatus = monitorFactory.waitForNextSuccessfulResult(syncStatusProvider)
-    assertThat(syncStatus).isEqualTo(NETWORK_ERROR)
-  }
-
-  @Test
-  fun testGetSyncStatus_setSyncStatus_toDataUploading_thenNetworkError_returnsNetworkError() {
-    val syncStatusProvider = syncStatusManager.getSyncStatus()
-    syncStatusManager.setSyncStatus(DATA_UPLOADING)
-
-    syncStatusManager.setSyncStatus(NETWORK_ERROR)
-
-    val syncStatus = monitorFactory.waitForNextSuccessfulResult(syncStatusProvider)
-    assertThat(syncStatus).isEqualTo(NETWORK_ERROR)
-  }
-
-  @Test
-  fun testGetSyncStatus_setSyncStatus_toUploading_thenNetworkError_existingSub_notifiesChange() {
-    val syncStatusProvider = syncStatusManager.getSyncStatus()
-    val monitor = monitorFactory.createMonitor(syncStatusProvider)
-    syncStatusManager.setSyncStatus(DATA_UPLOADING)
-    monitor.waitForNextResult()
-
-    syncStatusManager.setSyncStatus(NETWORK_ERROR)
-
-    // The latest value should be sent to the existing observer as a notification.
-    val syncStatus = monitor.waitForNextSuccessResult()
-    assertThat(syncStatus).isEqualTo(NETWORK_ERROR)
-  }
+  // No additional tests are implemented beyond those in the test base (as the implementation
+  // SyncStatusManagerImpl exactly implements the documented API of SyncStatusManager).
 
   private fun setUpTestApplicationComponent() {
     ApplicationProvider.getApplicationContext<TestApplication>().inject(this)
diff --git a/utility/src/test/java/org/oppia/android/util/logging/SyncStatusManagerTestBase.kt b/utility/src/test/java/org/oppia/android/util/logging/SyncStatusManagerTestBase.kt
new file mode 100644
index 00000000000..c19dcfa6d3d
--- /dev/null
+++ b/utility/src/test/java/org/oppia/android/util/logging/SyncStatusManagerTestBase.kt
@@ -0,0 +1,364 @@
+package org.oppia.android.util.logging
+
+import android.net.ConnectivityManager
+import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.async
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import org.junit.Test
+import org.oppia.android.app.model.EventLog
+import org.oppia.android.app.model.OppiaEventLogs
+import org.oppia.android.data.persistence.PersistentCacheStore
+import org.oppia.android.data.persistence.PersistentCacheStore.PublishMode.PUBLISH_TO_IN_MEMORY_CACHE
+import org.oppia.android.data.persistence.PersistentCacheStore.UpdateMode.UPDATE_ALWAYS
+import org.oppia.android.testing.assertThrows
+import org.oppia.android.testing.data.DataProviderTestMonitor
+import org.oppia.android.testing.networking.NetworkConnectionTestUtil
+import org.oppia.android.testing.threading.TestCoroutineDispatchers
+import org.oppia.android.util.data.AsyncResult
+import org.oppia.android.util.logging.SyncStatusManager.SyncStatus
+
+/**
+ * Tests for [SyncStatusManager]. This provides the common tests needed to verify the manager's API
+ * regardless of the implementation. This suite should not be used directly, and instead should only
+ * be used by implementation test suites of [SyncStatusManager].
+ *
+ * NOTE TO DEVELOPERS: This is essentially the only time inheritance is good practice for tests
+ * since JUnit doesn't provide a way to compose the tests themselves, only behaviors around the
+ * tests.
+ */
+// Same parameter value: helpers reduce test context, even if they are used by 1 test.
+// Function name: test names are conventionally named with underscores.
+@Suppress("SameParameterValue", "FunctionName")
+abstract class SyncStatusManagerTestBase {
+  protected abstract val impl: SyncStatusManager
+  protected abstract val monitorFactory: DataProviderTestMonitor.Factory
+  protected abstract val persistentCacheStoreFactory: PersistentCacheStore.Factory
+  protected abstract val networkConnectionTestUtil: NetworkConnectionTestUtil
+  protected abstract val testCoroutineDispatchers: TestCoroutineDispatchers
+  protected abstract val backgroundDispatcher: CoroutineDispatcher
+
+  private val backgroundDispatcherScope by lazy { CoroutineScope(backgroundDispatcher) }
+  protected val logsCacheStore by lazy { createPrimedLogStore() }
+
+  @Test
+  fun testGetSyncStatus_initialState_returnsInitialUnknown() {
+    val syncStatusProvider = impl.getSyncStatus()
+
+    val syncStatus = monitorFactory.waitForNextSuccessfulResult(syncStatusProvider)
+    assertThat(syncStatus).isEqualTo(SyncStatus.INITIAL_UNKNOWN)
+  }
+
+  @Test
+  fun testInitializeEventLogStore_twice_throwsException() {
+    impl.initializeEventLogStore(logsCacheStore)
+
+    val error = assertThrows(IllegalStateException::class) {
+      impl.initializeEventLogStore(logsCacheStore)
+    }
+
+    assertThat(error)
+      .hasMessageThat()
+      .contains("Attempting to initialize the log store a second time.")
+  }
+
+  @Test
+  fun testGetSyncStatus_withInitedLogStore_noConnectivity_noEvents_returnsInitialUnknown() {
+    val syncStatusProvider = impl.getSyncStatus()
+    impl.initializeEventLogStore(logsCacheStore)
+    disconnectNetwork()
+
+    val syncStatus = monitorFactory.waitForNextSuccessfulResult(syncStatusProvider)
+
+    // While there's no connectivity, it's not worth reporting since there are not actually any
+    // events waiting to be uploaded.
+    assertThat(syncStatus).isEqualTo(SyncStatus.INITIAL_UNKNOWN)
+  }
+
+  @Test
+  fun testGetSyncStatus_withInitedLogStore_noEvents_returnsInitialUnknown() {
+    val syncStatusProvider = impl.getSyncStatus()
+    impl.initializeEventLogStore(logsCacheStore)
+    connectNetwork()
+
+    val syncStatus = monitorFactory.waitForNextSuccessfulResult(syncStatusProvider)
+
+    assertThat(syncStatus).isEqualTo(SyncStatus.INITIAL_UNKNOWN)
+  }
+
+  @Test
+  fun testGetSyncStatus_withInitedLogStore_withEvents_returnsWaitingToStartUploading() {
+    val syncStatusProvider = impl.getSyncStatus()
+    impl.initializeEventLogStore(logsCacheStore)
+    connectNetwork()
+    queueEventLogForUploading(EVENT_LOG_0)
+    queueEventLogForUploading(EVENT_LOG_1)
+
+    val syncStatus = monitorFactory.waitForNextSuccessfulResult(syncStatusProvider)
+
+    assertThat(syncStatus).isEqualTo(SyncStatus.WAITING_TO_START_UPLOADING)
+  }
+
+  @Test
+  fun testGetSyncStatus_withInitedLogStore_withEvents_someRemoved_returnsWaitingToStartUploading() {
+    impl.initializeEventLogStore(logsCacheStore)
+    connectNetwork()
+    val syncStatusMonitor = monitorFactory.createMonitor(impl.getSyncStatus())
+    queueEventLogForUploading(EVENT_LOG_0)
+    queueEventLogForUploading(EVENT_LOG_1)
+
+    moveEventLogToUploaded(EVENT_LOG_0) // Simulate uploading the first event.
+    testCoroutineDispatchers.runCurrent()
+
+    // One, updating the cache should trigger a change in the monitor's provider. Two, having one
+    // more event remaining means that the upload isn't complete yet. This is simulating the case
+    // when uploading started and stopped, and only one event was successfully uploaded in that
+    // time.
+    val syncStatus = syncStatusMonitor.ensureNextResultIsSuccess()
+    assertThat(syncStatus).isEqualTo(SyncStatus.WAITING_TO_START_UPLOADING)
+  }
+
+  @Test
+  fun testGetSyncStatus_withInitedLogStore_withEvents_allRemoved_returnsDataUploaded() {
+    impl.initializeEventLogStore(logsCacheStore)
+    connectNetwork()
+    val syncStatusMonitor = monitorFactory.createMonitor(impl.getSyncStatus())
+    queueEventLogForUploading(EVENT_LOG_0)
+    queueEventLogForUploading(EVENT_LOG_1)
+
+    // Simulate uploading both events.
+    moveEventLogToUploaded(EVENT_LOG_0)
+    moveEventLogToUploaded(EVENT_LOG_1)
+    testCoroutineDispatchers.runCurrent()
+
+    // No events remaining to upload indicates that everything has been uploaded.
+    val syncStatus = syncStatusMonitor.ensureNextResultIsSuccess()
+    assertThat(syncStatus).isEqualTo(SyncStatus.DATA_UPLOADED)
+  }
+
+  @Test
+  fun testGetSyncStatus_withInitedLogStore_noConnection_reportUploading_returnsNoConnectivity() {
+    impl.initializeEventLogStore(logsCacheStore)
+    disconnectNetwork()
+    val syncStatusMonitor = monitorFactory.createMonitor(impl.getSyncStatus())
+    queueEventLogForUploading(EVENT_LOG_0)
+
+    impl.reportUploadingStarted()
+    testCoroutineDispatchers.runCurrent()
+
+    // No connectivity is a higher priority state to report.
+    val syncStatus = syncStatusMonitor.ensureNextResultIsSuccess()
+    assertThat(syncStatus).isEqualTo(SyncStatus.NO_CONNECTIVITY)
+  }
+
+  @Test
+  fun testGetSyncStatus_withInitedLogStore_connected_reportUploadingStarted_returnsUploading() {
+    impl.initializeEventLogStore(logsCacheStore)
+    connectNetwork()
+    val syncStatusMonitor = monitorFactory.createMonitor(impl.getSyncStatus())
+    queueEventLogForUploading(EVENT_LOG_0)
+
+    impl.reportUploadingStarted()
+    testCoroutineDispatchers.runCurrent()
+
+    // Reporting the uploading state should trigger a change in the sync status data provider.
+    val syncStatus = syncStatusMonitor.ensureNextResultIsSuccess()
+    assertThat(syncStatus).isEqualTo(SyncStatus.DATA_UPLOADING)
+  }
+
+  @Test
+  fun testGetSyncStatus_noConnection_reportUploaded_uploadedEvent_returnsUploaded() {
+    impl.initializeEventLogStore(logsCacheStore)
+    disconnectNetwork()
+    val syncStatusMonitor = monitorFactory.createMonitor(impl.getSyncStatus())
+    queueEventLogForUploading(EVENT_LOG_0)
+    impl.reportUploadingStarted()
+    testCoroutineDispatchers.runCurrent()
+    moveEventLogToUploaded(EVENT_LOG_0)
+
+    impl.reportUploadingEnded()
+    testCoroutineDispatchers.runCurrent()
+
+    // No connectivity only matters if there are pending events. Since an event was logged, that
+    // status should be reported instead.
+    val syncStatus = syncStatusMonitor.ensureNextResultIsSuccess()
+    assertThat(syncStatus).isEqualTo(SyncStatus.DATA_UPLOADED)
+  }
+
+  @Test
+  fun testGetSyncStatus_noConnection_reportUploaded_uploadedPendingEvents_returnsNoConnectivity() {
+    impl.initializeEventLogStore(logsCacheStore)
+    disconnectNetwork()
+    val syncStatusMonitor = monitorFactory.createMonitor(impl.getSyncStatus())
+    queueEventLogForUploading(EVENT_LOG_0)
+    impl.reportUploadingStarted()
+    testCoroutineDispatchers.runCurrent()
+    moveEventLogToUploaded(EVENT_LOG_0)
+
+    // Queue another event.
+    impl.reportUploadingEnded()
+    queueEventLogForUploading(EVENT_LOG_0)
+    testCoroutineDispatchers.runCurrent()
+
+    // Despite there being an uploaded event, there's now no connection for a pending event so that
+    // should take priority in reporting.
+    val syncStatus = syncStatusMonitor.ensureNextResultIsSuccess()
+    assertThat(syncStatus).isEqualTo(SyncStatus.NO_CONNECTIVITY)
+  }
+
+  @Test
+  fun testGetSyncStatus_withInitedLogStore_connected_reportUploadingEnded_returnsUploaded() {
+    impl.initializeEventLogStore(logsCacheStore)
+    connectNetwork()
+    val syncStatusMonitor = monitorFactory.createMonitor(impl.getSyncStatus())
+    queueEventLogForUploading(EVENT_LOG_0)
+    impl.reportUploadingStarted()
+    testCoroutineDispatchers.runCurrent()
+    moveEventLogToUploaded(EVENT_LOG_0)
+
+    impl.reportUploadingEnded()
+    testCoroutineDispatchers.runCurrent()
+
+    // Reporting the uploaded state should trigger a change in the sync status data provider.
+    val syncStatus = syncStatusMonitor.ensureNextResultIsSuccess()
+    assertThat(syncStatus).isEqualTo(SyncStatus.DATA_UPLOADED)
+  }
+
+  @Test
+  fun testGetSyncStatus_noConnection_reportError_withEvent_returnsNoConnectivity() {
+    impl.initializeEventLogStore(logsCacheStore)
+    disconnectNetwork()
+    val syncStatusMonitor = monitorFactory.createMonitor(impl.getSyncStatus())
+
+    queueEventLogForUploading(EVENT_LOG_0)
+    impl.reportUploadingStarted()
+    impl.reportUploadError()
+    testCoroutineDispatchers.runCurrent()
+
+    // No connectivity is a higher priority state to report.
+    val syncStatus = syncStatusMonitor.ensureNextResultIsSuccess()
+    assertThat(syncStatus).isEqualTo(SyncStatus.NO_CONNECTIVITY)
+  }
+
+  @Test
+  fun testGetSyncStatus_withInitedLogStore_connected_reportError_returnsUploadError() {
+    impl.initializeEventLogStore(logsCacheStore)
+    connectNetwork()
+    val syncStatusMonitor = monitorFactory.createMonitor(impl.getSyncStatus())
+
+    impl.reportUploadingStarted()
+    impl.reportUploadError()
+    testCoroutineDispatchers.runCurrent()
+
+    // Reporting the upload error state should trigger a change in the sync status data provider.
+    val syncStatus = syncStatusMonitor.ensureNextResultIsSuccess()
+    assertThat(syncStatus).isEqualTo(SyncStatus.UPLOAD_ERROR)
+  }
+
+  @Test
+  fun testGetSyncStatus_withInitedLogStore_noConnectionThenConnected_reportError_returnsError() {
+    impl.initializeEventLogStore(logsCacheStore)
+    val syncStatusMonitor = monitorFactory.createMonitor(impl.getSyncStatus())
+    queueEventLogForUploading(EVENT_LOG_0)
+
+    // Test a possible scenario that mimics a real possible case where starting to upload events
+    // races against a sudden loss of connectivity which, in turns, results in an upload error
+    // around the time connectivity is restored.
+    disconnectNetwork()
+    impl.reportUploadingStarted()
+    connectNetwork()
+    impl.reportUploadError()
+    testCoroutineDispatchers.runCurrent()
+
+    val syncStatus = syncStatusMonitor.ensureNextResultIsSuccess()
+    assertThat(syncStatus).isEqualTo(SyncStatus.UPLOAD_ERROR)
+  }
+
+  private fun createPrimedLogStore(): PersistentCacheStore<OppiaEventLogs> {
+    return persistentCacheStoreFactory.create(
+      "test_cache_logs", OppiaEventLogs.getDefaultInstance()
+    ).also {
+      // Priming the log store ahead of time is, strictly speaking, not necessary for the tests.
+      // However, it's closer to how the log store would likely behave in production so this can
+      // help minimize some potential behavioral skew.
+      it.primeInMemoryAndDiskCacheAsync(
+        UPDATE_ALWAYS, PUBLISH_TO_IN_MEMORY_CACHE
+      ).waitForSuccessfulResult()
+    }
+  }
+
+  protected fun queueEventLogForUploading(eventLog: EventLog) {
+    logsCacheStore.storeDataAsync { eventLogs ->
+      eventLogs.toBuilder().apply { addEventLogsToUpload(eventLog) }.build()
+    }.waitForSuccessfulResult()
+  }
+
+  protected fun moveEventLogToUploaded(eventLog: EventLog) {
+    logsCacheStore.storeDataAsync { eventLogs ->
+      eventLogs.toBuilder().apply {
+        removeEventLogsToUpload(eventLogsToUploadList.indexOf(eventLog))
+        addUploadedEventLogs(eventLog)
+      }.build()
+    }.waitForSuccessfulResult()
+  }
+
+  @Suppress("DEPRECATION") // Robolectric Shadow API requires interacting with deprecated fields.
+  protected fun disconnectNetwork() {
+    networkConnectionTestUtil.setNetworkInfo(
+      status = ConnectivityManager.TYPE_MOBILE,
+      networkState = android.net.NetworkInfo.State.DISCONNECTED
+    )
+  }
+
+  @Suppress("DEPRECATION") // Robolectric Shadow API requires interacting with deprecated fields.
+  protected fun connectNetwork() {
+    networkConnectionTestUtil.setNetworkInfo(
+      status = ConnectivityManager.TYPE_MOBILE,
+      networkState = android.net.NetworkInfo.State.CONNECTED
+    )
+  }
+
+  private fun <T> Deferred<T>.waitForSuccessfulResult() {
+    return when (val result = waitForResult()) {
+      is AsyncResult.Pending -> error("Deferred never finished.")
+      is AsyncResult.Success -> {} // Nothing to do; the result succeeded.
+      is AsyncResult.Failure -> throw IllegalStateException("Deferred failed", result.error)
+    }
+  }
+
+  private fun <T> Deferred<T>.waitForResult() = toStateFlow().waitForLatestValue()
+
+  private fun <T> Deferred<T>.toStateFlow(): StateFlow<AsyncResult<T>> {
+    val deferred = this
+    return MutableStateFlow<AsyncResult<T>>(value = AsyncResult.Pending()).also { flow ->
+      backgroundDispatcherScope.async {
+        flow.emit(AsyncResult.Success(deferred.await()))
+      }.invokeOnCompletion {
+        it?.let { flow.tryEmit(AsyncResult.Failure(it)) }
+      }
+    }
+  }
+
+  private fun <T> StateFlow<T>.waitForLatestValue(): T =
+    also { testCoroutineDispatchers.runCurrent() }.value
+
+  private companion object {
+    private const val EVENT_LOG_TIMESTAMP_0 = 1556061720000
+    private const val EVENT_LOG_TIMESTAMP_1 = 1556094120000
+
+    private val OPEN_HOME_CONTEXT = EventLog.Context.newBuilder().apply { openHome = true }.build()
+    private val EVENT_LOG_0 = createEventLog(EVENT_LOG_TIMESTAMP_0, OPEN_HOME_CONTEXT)
+    private val EVENT_LOG_1 = createEventLog(EVENT_LOG_TIMESTAMP_1, OPEN_HOME_CONTEXT)
+
+    private fun createEventLog(timestamp: Long, context: EventLog.Context): EventLog {
+      return EventLog.newBuilder().apply {
+        this.timestamp = timestamp
+        this.priority = EventLog.Priority.ESSENTIAL
+        this.context = context
+      }.build()
+    }
+  }
+}
diff --git a/utility/src/test/java/org/oppia/android/util/threading/AtomicEnumTest.kt b/utility/src/test/java/org/oppia/android/util/threading/AtomicEnumTest.kt
new file mode 100644
index 00000000000..c3386aa1a12
--- /dev/null
+++ b/utility/src/test/java/org/oppia/android/util/threading/AtomicEnumTest.kt
@@ -0,0 +1,212 @@
+package org.oppia.android.util.threading
+
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.oppia.android.testing.assertThrows
+import org.oppia.android.testing.junit.OppiaParameterizedTestRunner
+import org.oppia.android.testing.junit.OppiaParameterizedTestRunner.Iteration
+import org.oppia.android.testing.junit.OppiaParameterizedTestRunner.Parameter
+import org.oppia.android.testing.junit.OppiaParameterizedTestRunner.RunParameterized
+import org.oppia.android.testing.junit.OppiaParameterizedTestRunner.SelectRunnerPlatform
+import org.oppia.android.testing.junit.ParameterizedJunitTestRunner
+
+/** Tests for [AtomicEnum]. */
+// FunctionName: test names are conventionally named with underscores.
+@Suppress("FunctionName")
+@RunWith(OppiaParameterizedTestRunner::class)
+@SelectRunnerPlatform(ParameterizedJunitTestRunner::class)
+class AtomicEnumTest {
+  @Parameter lateinit var enumToSet: String
+
+  private val largeEnumValue by lazy { LargeEnum.valueOf(enumToSet) }
+
+  @Test
+  fun testGetValue_simpleAtomicEnum_returnsInitialValue() {
+    val atomicEnum = AtomicEnum.create(initial = SimpleEnum.FIRST)
+
+    val currentValue = atomicEnum.value
+
+    assertThat(currentValue).isEqualTo(SimpleEnum.FIRST)
+  }
+
+  @Test
+  fun testGetValue_simpleAtomicEnum_afterSetValue_returnsUpdatedValue() {
+    val atomicEnum = AtomicEnum.create(initial = SimpleEnum.FIRST)
+    atomicEnum.value = SimpleEnum.SECOND
+
+    val currentValue = atomicEnum.value
+
+    assertThat(currentValue).isEqualTo(SimpleEnum.SECOND)
+  }
+
+  @Test
+  @RunParameterized(
+    Iteration("a", "enumToSet=A"),
+    Iteration("b", "enumToSet=B"),
+    Iteration("c", "enumToSet=C"),
+    Iteration("d", "enumToSet=D"),
+    Iteration("e", "enumToSet=E"),
+    Iteration("f", "enumToSet=F"),
+    Iteration("g", "enumToSet=G"),
+    Iteration("h", "enumToSet=H"),
+    Iteration("i", "enumToSet=I"),
+    Iteration("j", "enumToSet=J")
+  )
+  fun testGetValue_largeAtomicEnum_setAllPossibleValues_returnsUpdatedValue() {
+    val atomicEnum = AtomicEnum.create(initial = LargeEnum.A)
+    atomicEnum.value = largeEnumValue
+
+    val currentValue = atomicEnum.value
+
+    assertThat(currentValue).isEqualTo(largeEnumValue)
+  }
+
+  @Test
+  fun testGetAndSetValue_simpleAtomicEnum_returnsInitialValue() {
+    val atomicEnum = AtomicEnum.create(initial = SimpleEnum.FIRST)
+
+    val currentValue = atomicEnum.getAndSet(SimpleEnum.SECOND)
+
+    // The initial value should be returned.
+    assertThat(currentValue).isEqualTo(SimpleEnum.FIRST)
+  }
+
+  @Test
+  fun testGetAndSetValue_simpleAtomicEnum_afterSetValue_returnsFirstUpdatedValue() {
+    val atomicEnum = AtomicEnum.create(initial = SimpleEnum.FIRST)
+    atomicEnum.value = SimpleEnum.SECOND
+
+    val currentValue = atomicEnum.getAndSet(SimpleEnum.THIRD)
+
+    // The previous value should be returned.
+    assertThat(currentValue).isEqualTo(SimpleEnum.SECOND)
+  }
+
+  @Test
+  fun testGetValue_simpleAtomicEnum_afterGetAndSetValue_returnsUpdatedValue() {
+    val atomicEnum = AtomicEnum.create(initial = SimpleEnum.FIRST)
+    atomicEnum.getAndSet(SimpleEnum.SECOND)
+
+    val currentValue = atomicEnum.value
+
+    // getAndSet should have a side effect of changing the enum's value.
+    assertThat(currentValue).isEqualTo(SimpleEnum.SECOND)
+  }
+
+  @Test
+  fun testGetValue_simpleAtomicEnum_afterGetAndSetValue_afterEarlierSetValue_returnsLatestValue() {
+    val atomicEnum = AtomicEnum.create(initial = SimpleEnum.FIRST)
+    atomicEnum.value = SimpleEnum.SECOND
+    atomicEnum.getAndSet(SimpleEnum.THIRD)
+
+    val currentValue = atomicEnum.value
+
+    // getAndSet should have a side effect of changing the enum's value, overwriting previous sets.
+    assertThat(currentValue).isEqualTo(SimpleEnum.THIRD)
+  }
+
+  @Test
+  fun testCreate_enumWithNoConstants_failsSinceInitialIsMissing() {
+    val exception = assertThrows(IllegalArgumentException::class) {
+      AtomicEnum.create(SimpleEnum.FIRST, possibilities = emptyList())
+    }
+
+    assertThat(exception).hasMessageThat().contains("Possibilities don't include initial value")
+  }
+
+  @Test
+  fun testGetValue_enumWithOnlyInitialConstant_returnsInitialValue() {
+    val atomicEnum = AtomicEnum.create(SimpleEnum.FIRST, possibilities = listOf(SimpleEnum.FIRST))
+
+    val currentValue = atomicEnum.value
+
+    assertThat(currentValue).isEqualTo(SimpleEnum.FIRST)
+  }
+
+  @Test
+  fun testGetValue_enumWithOnlyInitialConstant_afterSettingSameValue_returnsInitialValue() {
+    val atomicEnum = AtomicEnum.create(SimpleEnum.FIRST, possibilities = listOf(SimpleEnum.FIRST))
+    atomicEnum.value = SimpleEnum.FIRST // The initial value is accepted, so it can be set.
+
+    val currentValue = atomicEnum.value
+
+    assertThat(currentValue).isEqualTo(SimpleEnum.FIRST)
+  }
+
+  @Test
+  fun testSetValue_enumWithOnlyInitialConstant_failsSinceValueIsMissing() {
+    val atomicEnum = AtomicEnum.create(SimpleEnum.FIRST, possibilities = listOf(SimpleEnum.FIRST))
+
+    val exception = assertThrows(IllegalArgumentException::class) {
+      atomicEnum.value = SimpleEnum.SECOND
+    }
+
+    assertThat(exception)
+      .hasMessageThat()
+      .contains("Constant is not in the supported list of constants")
+  }
+
+  @Test
+  fun testGetValue_enumWithTwoConstants_afterSetToOtherValue_returnsUpdatedValue() {
+    val atomicEnum =
+      AtomicEnum.create(
+        SimpleEnum.FIRST, possibilities = listOf(SimpleEnum.FIRST, SimpleEnum.SECOND)
+      )
+    atomicEnum.value = SimpleEnum.SECOND
+
+    val currentValue = atomicEnum.value
+
+    // The second enum value is valid.
+    assertThat(currentValue).isEqualTo(SimpleEnum.SECOND)
+  }
+
+  @Test
+  fun testSetValue_enumWithTwoConstants_toUnsupportedValue_failsSinceValueIsMissing() {
+    val atomicEnum =
+      AtomicEnum.create(
+        SimpleEnum.FIRST, possibilities = listOf(SimpleEnum.FIRST, SimpleEnum.SECOND)
+      )
+
+    val exception = assertThrows(IllegalArgumentException::class) {
+      // The third constant isn't among the supported constants.
+      atomicEnum.value = SimpleEnum.THIRD
+    }
+
+    assertThat(exception)
+      .hasMessageThat()
+      .contains("Constant is not in the supported list of constants")
+  }
+
+  @Test
+  fun testGetAndSetValue_enumWithOnlyInitialConstant_failsSinceValueIsMissing() {
+    val atomicEnum = AtomicEnum.create(SimpleEnum.FIRST, possibilities = listOf(SimpleEnum.FIRST))
+
+    val exception = assertThrows(IllegalArgumentException::class) {
+      atomicEnum.getAndSet(SimpleEnum.SECOND)
+    }
+
+    assertThat(exception)
+      .hasMessageThat()
+      .contains("Constant is not in the supported list of constants")
+  }
+
+  private enum class SimpleEnum {
+    FIRST,
+    SECOND,
+    THIRD
+  }
+
+  private enum class LargeEnum {
+    A,
+    B,
+    C,
+    D,
+    E,
+    F,
+    G,
+    H,
+    I,
+    J
+  }
+}
diff --git a/utility/src/test/java/org/oppia/android/util/threading/BUILD.bazel b/utility/src/test/java/org/oppia/android/util/threading/BUILD.bazel
new file mode 100644
index 00000000000..acbed30d4a1
--- /dev/null
+++ b/utility/src/test/java/org/oppia/android/util/threading/BUILD.bazel
@@ -0,0 +1,19 @@
+"""
+Tests for general purpose utilities for multi-threading and concurrency.
+"""
+
+load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_test")
+
+kt_jvm_test(
+    name = "AtomicEnumTest",
+    srcs = ["AtomicEnumTest.kt"],
+    test_class = "org.oppia.android.util.threading.AtomicEnumTest",
+    deps = [
+        "//testing",
+        "//testing/src/main/java/org/oppia/android/testing/junit:oppia_parameterized_test_runner",
+        "//testing/src/main/java/org/oppia/android/testing/junit:parameterized_junit_test_runner",
+        "//third_party:com_google_truth_truth",
+        "//third_party:junit_junit",
+        "//utility/src/main/java/org/oppia/android/util/threading:atomic_enum",
+    ],
+)

From 642030ced6f53cc883f2b64c0aa5f413736e65d1 Mon Sep 17 00:00:00 2001
From: Ben Henning <ben@oppia.org>
Date: Thu, 9 Mar 2023 18:43:54 -0800
Subject: [PATCH 29/38] Remove AtomicEnum.

It really isn't needed since we can just use AtomicReference, though it
does offer better type safety (since it can't be null), filtering
(though we don't need that currently), and possibly better performance
(since an int is tracked instead of an object reference) though I suspect
that won't actually be the case.
---
 .../file_content_validation_checks.textproto  |   1 -
 .../oppia/android/testing/logging/BUILD.bazel |   1 -
 .../testing/logging/TestSyncStatusManager.kt  |   3 +-
 .../oppia/android/util/logging/BUILD.bazel    |   1 -
 .../util/logging/SyncStatusManagerImpl.kt     |  10 +-
 .../PlatformParameterConstants.kt             |   3 +-
 .../android/util/threading/AtomicEnum.kt      |  45 ----
 .../oppia/android/util/threading/BUILD.bazel  |  10 +-
 .../android/util/threading/AtomicEnumTest.kt  | 212 ------------------
 .../oppia/android/util/threading/BUILD.bazel  |  19 --
 10 files changed, 8 insertions(+), 297 deletions(-)
 delete mode 100644 utility/src/main/java/org/oppia/android/util/threading/AtomicEnum.kt
 delete mode 100644 utility/src/test/java/org/oppia/android/util/threading/AtomicEnumTest.kt
 delete mode 100644 utility/src/test/java/org/oppia/android/util/threading/BUILD.bazel

diff --git a/scripts/assets/file_content_validation_checks.textproto b/scripts/assets/file_content_validation_checks.textproto
index 43addc32d4f..2166d98095c 100644
--- a/scripts/assets/file_content_validation_checks.textproto
+++ b/scripts/assets/file_content_validation_checks.textproto
@@ -323,7 +323,6 @@ file_content_checks {
   exempted_file_name: "utility/src/test/java/org/oppia/android/util/math/PolynomialExtensionsTest.kt"
   exempted_file_name: "utility/src/test/java/org/oppia/android/util/math/RealExtensionsTest.kt"
   exempted_file_name: "utility/src/test/java/org/oppia/android/util/profile/ProfileNameValidatorTest.kt"
-  exempted_file_name: "utility/src/test/java/org/oppia/android/util/threading/AtomicEnumTest.kt"
   exempted_file_patterns: "testing/src/main/java/org/oppia/android/testing/junit/.+?\\.kt"
 }
 file_content_checks {
diff --git a/testing/src/main/java/org/oppia/android/testing/logging/BUILD.bazel b/testing/src/main/java/org/oppia/android/testing/logging/BUILD.bazel
index e76a4a5184f..328f36948d5 100644
--- a/testing/src/main/java/org/oppia/android/testing/logging/BUILD.bazel
+++ b/testing/src/main/java/org/oppia/android/testing/logging/BUILD.bazel
@@ -30,7 +30,6 @@ kt_android_library(
         ":dagger",
         "//utility/src/main/java/org/oppia/android/util/logging:sync_status_manager",
         "//utility/src/main/java/org/oppia/android/util/logging:sync_status_manager_impl",
-        "//utility/src/main/java/org/oppia/android/util/threading:atomic_enum",
     ],
 )
 
diff --git a/testing/src/main/java/org/oppia/android/testing/logging/TestSyncStatusManager.kt b/testing/src/main/java/org/oppia/android/testing/logging/TestSyncStatusManager.kt
index ca4d7ac0f13..73f010adf8f 100644
--- a/testing/src/main/java/org/oppia/android/testing/logging/TestSyncStatusManager.kt
+++ b/testing/src/main/java/org/oppia/android/testing/logging/TestSyncStatusManager.kt
@@ -12,7 +12,6 @@ import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.DATA_UPLOADIN
 import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.INITIAL_UNKNOWN
 import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.UPLOAD_ERROR
 import org.oppia.android.util.logging.SyncStatusManagerImpl
-import org.oppia.android.util.threading.AtomicEnum
 import java.util.concurrent.CopyOnWriteArrayList
 import java.util.concurrent.atomic.AtomicReference
 import javax.inject.Inject
@@ -41,7 +40,7 @@ class TestSyncStatusManager @Inject constructor(
       }
     }.transform(STATUS_PROVIDER_ID, ::augmentSyncStatus)
   private val forcedSyncStatus = AtomicReference<SyncStatus?>(null)
-  private val latestSyncStatus = AtomicEnum.create(INITIAL_UNKNOWN)
+  private val latestSyncStatus = AtomicReference(INITIAL_UNKNOWN)
 
   override fun getSyncStatus() = syncStatusProvider
 
diff --git a/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel b/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel
index bf171a323fc..2835607af42 100644
--- a/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel
+++ b/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel
@@ -210,7 +210,6 @@ kt_android_library(
         "//utility/src/main/java/org/oppia/android/util/data:async_data_subscription_manager",
         "//utility/src/main/java/org/oppia/android/util/data:data_providers",
         "//utility/src/main/java/org/oppia/android/util/networking:network_connection_util",
-        "//utility/src/main/java/org/oppia/android/util/threading:atomic_enum",
     ],
 )
 
diff --git a/utility/src/main/java/org/oppia/android/util/logging/SyncStatusManagerImpl.kt b/utility/src/main/java/org/oppia/android/util/logging/SyncStatusManagerImpl.kt
index 0c8cfedeb32..23123573f28 100644
--- a/utility/src/main/java/org/oppia/android/util/logging/SyncStatusManagerImpl.kt
+++ b/utility/src/main/java/org/oppia/android/util/logging/SyncStatusManagerImpl.kt
@@ -16,7 +16,7 @@ import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.UPLOAD_ERROR
 import org.oppia.android.util.logging.SyncStatusManager.SyncStatus.WAITING_TO_START_UPLOADING
 import org.oppia.android.util.networking.NetworkConnectionUtil
 import org.oppia.android.util.networking.NetworkConnectionUtil.ProdConnectionStatus.NONE
-import org.oppia.android.util.threading.AtomicEnum
+import java.util.concurrent.atomic.AtomicReference
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -41,7 +41,7 @@ class SyncStatusManagerImpl @Inject constructor(
       AsyncResult.Success(INITIAL_UNKNOWN)
     }
   }
-  private val transientState = AtomicEnum.create(TransientState.NOT_UPLOADING)
+  private val transientState = AtomicReference(TransientState.NOT_UPLOADING)
 
   override fun getSyncStatus() = configurableSyncStatus
 
@@ -66,7 +66,7 @@ class SyncStatusManagerImpl @Inject constructor(
   }
 
   private fun reportStatusChange(newStatus: TransientState) {
-    transientState.value = newStatus
+    transientState.set(newStatus)
     asyncDataSubscriptionManager.notifyChangeAsync(SYNC_STATUS_PROVIDER_ID)
   }
 
@@ -76,14 +76,14 @@ class SyncStatusManagerImpl @Inject constructor(
     val hasConnectivity = networkConnectionUtil.getCurrentConnectionStatus() != NONE
     val hasEventsToUpload = oppiaEventLogs.eventLogsToUploadList.isNotEmpty()
     val hasUploadedEvents = oppiaEventLogs.uploadedEventLogsList.isNotEmpty()
-    return when (transientState.value) {
+    return when (transientState.get()) {
       TransientState.NOT_UPLOADING -> when {
         hasEventsToUpload -> if (hasConnectivity) WAITING_TO_START_UPLOADING else NO_CONNECTIVITY
         hasUploadedEvents -> DATA_UPLOADED
         else -> INITIAL_UNKNOWN // Nothing has been uploaded yet.
       }
       TransientState.UPLOADING -> if (hasConnectivity) DATA_UPLOADING else NO_CONNECTIVITY
-      TransientState.UPLOAD_FAILED -> if (hasConnectivity) UPLOAD_ERROR else NO_CONNECTIVITY
+      TransientState.UPLOAD_FAILED, null -> if (hasConnectivity) UPLOAD_ERROR else NO_CONNECTIVITY
     }.let { AsyncResult.Success(it) }
   }
 
diff --git a/utility/src/main/java/org/oppia/android/util/platformparameter/PlatformParameterConstants.kt b/utility/src/main/java/org/oppia/android/util/platformparameter/PlatformParameterConstants.kt
index 17726536667..1d04df9960e 100644
--- a/utility/src/main/java/org/oppia/android/util/platformparameter/PlatformParameterConstants.kt
+++ b/utility/src/main/java/org/oppia/android/util/platformparameter/PlatformParameterConstants.kt
@@ -105,12 +105,11 @@ annotation class EnableLearnerStudyAnalytics
  */
 const val LEARNER_STUDY_ANALYTICS = "learner_study_analytics"
 
-// TODO: Revert this.
 /**
  * Default value of the platform parameter that controls the visibility of [ProfileAndDeviceIdActivity]
  * and working of learner study related analytics logging.
  */
-const val LEARNER_STUDY_ANALYTICS_DEFAULT_VALUE = true
+const val LEARNER_STUDY_ANALYTICS_DEFAULT_VALUE = false
 
 /**
  * Qualifier for the platform parameter that controls whether to cache LaTeX rendering using Glide.
diff --git a/utility/src/main/java/org/oppia/android/util/threading/AtomicEnum.kt b/utility/src/main/java/org/oppia/android/util/threading/AtomicEnum.kt
deleted file mode 100644
index 8a97d527419..00000000000
--- a/utility/src/main/java/org/oppia/android/util/threading/AtomicEnum.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.oppia.android.util.threading
-
-import java.util.concurrent.atomic.AtomicInteger
-
-// TODO: Remove this class in favor of AtomicReference? Remove regex pattern for this file's test, too.
-/**
- * TODO: Finish.
- */
-class AtomicEnum<E : Enum<E>> private constructor(
-  private val initialValue: E,
-  private val constants: Map<Int, E>
-) {
-  private val backingAtomic by lazy { AtomicInteger(initialValue.toValidOrdinal()) }
-
-  /** TODO: Finish. */
-  var value: E
-    set(value) = backingAtomic.set(value.toValidOrdinal())
-    get() = backingAtomic.get().toValidConstant()
-
-  /** TODO: Finish. */
-  fun getAndSet(value: E): E = backingAtomic.getAndSet(value.toValidOrdinal()).toValidConstant()
-
-  private fun E.toValidOrdinal(): Int {
-    return ordinal.also {
-      require(it in constants) {
-        "Constant is not in the supported list of constants: $this (per $constants)."
-      }
-    }
-  }
-
-  // It's safe to use getValue() since enum constants are verified when set.
-  private fun Int.toValidConstant(): E = constants.getValue(this)
-
-  companion object {
-    /** TODO: Finish. */
-    inline fun <reified E : Enum<E>> create(initial: E): AtomicEnum<E> =
-      create(initial, enumValues<E>().asIterable())
-
-    /** TODO: Finish. */
-    fun <E : Enum<E>> create(initial: E, possibilities: Iterable<E>): AtomicEnum<E> {
-      require(initial in possibilities) { "Possibilities don't include initial value: $initial." }
-      return AtomicEnum(initial, possibilities.associateBy { it.ordinal })
-    }
-  }
-}
diff --git a/utility/src/main/java/org/oppia/android/util/threading/BUILD.bazel b/utility/src/main/java/org/oppia/android/util/threading/BUILD.bazel
index 90b63c0a706..bb5b44721bc 100644
--- a/utility/src/main/java/org/oppia/android/util/threading/BUILD.bazel
+++ b/utility/src/main/java/org/oppia/android/util/threading/BUILD.bazel
@@ -3,7 +3,7 @@ General purpose utilities for multi-threading and concurrency.
 """
 
 load("@dagger//:workspace_defs.bzl", "dagger_rules")
-load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library", "kt_jvm_library")
+load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library")
 
 kt_android_library(
     name = "annotations",
@@ -17,14 +17,6 @@ kt_android_library(
     ],
 )
 
-kt_jvm_library(
-    name = "atomic_enum",
-    srcs = [
-        "AtomicEnum.kt",
-    ],
-    visibility = ["//:oppia_api_visibility"],
-)
-
 kt_android_library(
     name = "dispatcher_injector",
     srcs = [
diff --git a/utility/src/test/java/org/oppia/android/util/threading/AtomicEnumTest.kt b/utility/src/test/java/org/oppia/android/util/threading/AtomicEnumTest.kt
deleted file mode 100644
index c3386aa1a12..00000000000
--- a/utility/src/test/java/org/oppia/android/util/threading/AtomicEnumTest.kt
+++ /dev/null
@@ -1,212 +0,0 @@
-package org.oppia.android.util.threading
-
-import com.google.common.truth.Truth.assertThat
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.oppia.android.testing.assertThrows
-import org.oppia.android.testing.junit.OppiaParameterizedTestRunner
-import org.oppia.android.testing.junit.OppiaParameterizedTestRunner.Iteration
-import org.oppia.android.testing.junit.OppiaParameterizedTestRunner.Parameter
-import org.oppia.android.testing.junit.OppiaParameterizedTestRunner.RunParameterized
-import org.oppia.android.testing.junit.OppiaParameterizedTestRunner.SelectRunnerPlatform
-import org.oppia.android.testing.junit.ParameterizedJunitTestRunner
-
-/** Tests for [AtomicEnum]. */
-// FunctionName: test names are conventionally named with underscores.
-@Suppress("FunctionName")
-@RunWith(OppiaParameterizedTestRunner::class)
-@SelectRunnerPlatform(ParameterizedJunitTestRunner::class)
-class AtomicEnumTest {
-  @Parameter lateinit var enumToSet: String
-
-  private val largeEnumValue by lazy { LargeEnum.valueOf(enumToSet) }
-
-  @Test
-  fun testGetValue_simpleAtomicEnum_returnsInitialValue() {
-    val atomicEnum = AtomicEnum.create(initial = SimpleEnum.FIRST)
-
-    val currentValue = atomicEnum.value
-
-    assertThat(currentValue).isEqualTo(SimpleEnum.FIRST)
-  }
-
-  @Test
-  fun testGetValue_simpleAtomicEnum_afterSetValue_returnsUpdatedValue() {
-    val atomicEnum = AtomicEnum.create(initial = SimpleEnum.FIRST)
-    atomicEnum.value = SimpleEnum.SECOND
-
-    val currentValue = atomicEnum.value
-
-    assertThat(currentValue).isEqualTo(SimpleEnum.SECOND)
-  }
-
-  @Test
-  @RunParameterized(
-    Iteration("a", "enumToSet=A"),
-    Iteration("b", "enumToSet=B"),
-    Iteration("c", "enumToSet=C"),
-    Iteration("d", "enumToSet=D"),
-    Iteration("e", "enumToSet=E"),
-    Iteration("f", "enumToSet=F"),
-    Iteration("g", "enumToSet=G"),
-    Iteration("h", "enumToSet=H"),
-    Iteration("i", "enumToSet=I"),
-    Iteration("j", "enumToSet=J")
-  )
-  fun testGetValue_largeAtomicEnum_setAllPossibleValues_returnsUpdatedValue() {
-    val atomicEnum = AtomicEnum.create(initial = LargeEnum.A)
-    atomicEnum.value = largeEnumValue
-
-    val currentValue = atomicEnum.value
-
-    assertThat(currentValue).isEqualTo(largeEnumValue)
-  }
-
-  @Test
-  fun testGetAndSetValue_simpleAtomicEnum_returnsInitialValue() {
-    val atomicEnum = AtomicEnum.create(initial = SimpleEnum.FIRST)
-
-    val currentValue = atomicEnum.getAndSet(SimpleEnum.SECOND)
-
-    // The initial value should be returned.
-    assertThat(currentValue).isEqualTo(SimpleEnum.FIRST)
-  }
-
-  @Test
-  fun testGetAndSetValue_simpleAtomicEnum_afterSetValue_returnsFirstUpdatedValue() {
-    val atomicEnum = AtomicEnum.create(initial = SimpleEnum.FIRST)
-    atomicEnum.value = SimpleEnum.SECOND
-
-    val currentValue = atomicEnum.getAndSet(SimpleEnum.THIRD)
-
-    // The previous value should be returned.
-    assertThat(currentValue).isEqualTo(SimpleEnum.SECOND)
-  }
-
-  @Test
-  fun testGetValue_simpleAtomicEnum_afterGetAndSetValue_returnsUpdatedValue() {
-    val atomicEnum = AtomicEnum.create(initial = SimpleEnum.FIRST)
-    atomicEnum.getAndSet(SimpleEnum.SECOND)
-
-    val currentValue = atomicEnum.value
-
-    // getAndSet should have a side effect of changing the enum's value.
-    assertThat(currentValue).isEqualTo(SimpleEnum.SECOND)
-  }
-
-  @Test
-  fun testGetValue_simpleAtomicEnum_afterGetAndSetValue_afterEarlierSetValue_returnsLatestValue() {
-    val atomicEnum = AtomicEnum.create(initial = SimpleEnum.FIRST)
-    atomicEnum.value = SimpleEnum.SECOND
-    atomicEnum.getAndSet(SimpleEnum.THIRD)
-
-    val currentValue = atomicEnum.value
-
-    // getAndSet should have a side effect of changing the enum's value, overwriting previous sets.
-    assertThat(currentValue).isEqualTo(SimpleEnum.THIRD)
-  }
-
-  @Test
-  fun testCreate_enumWithNoConstants_failsSinceInitialIsMissing() {
-    val exception = assertThrows(IllegalArgumentException::class) {
-      AtomicEnum.create(SimpleEnum.FIRST, possibilities = emptyList())
-    }
-
-    assertThat(exception).hasMessageThat().contains("Possibilities don't include initial value")
-  }
-
-  @Test
-  fun testGetValue_enumWithOnlyInitialConstant_returnsInitialValue() {
-    val atomicEnum = AtomicEnum.create(SimpleEnum.FIRST, possibilities = listOf(SimpleEnum.FIRST))
-
-    val currentValue = atomicEnum.value
-
-    assertThat(currentValue).isEqualTo(SimpleEnum.FIRST)
-  }
-
-  @Test
-  fun testGetValue_enumWithOnlyInitialConstant_afterSettingSameValue_returnsInitialValue() {
-    val atomicEnum = AtomicEnum.create(SimpleEnum.FIRST, possibilities = listOf(SimpleEnum.FIRST))
-    atomicEnum.value = SimpleEnum.FIRST // The initial value is accepted, so it can be set.
-
-    val currentValue = atomicEnum.value
-
-    assertThat(currentValue).isEqualTo(SimpleEnum.FIRST)
-  }
-
-  @Test
-  fun testSetValue_enumWithOnlyInitialConstant_failsSinceValueIsMissing() {
-    val atomicEnum = AtomicEnum.create(SimpleEnum.FIRST, possibilities = listOf(SimpleEnum.FIRST))
-
-    val exception = assertThrows(IllegalArgumentException::class) {
-      atomicEnum.value = SimpleEnum.SECOND
-    }
-
-    assertThat(exception)
-      .hasMessageThat()
-      .contains("Constant is not in the supported list of constants")
-  }
-
-  @Test
-  fun testGetValue_enumWithTwoConstants_afterSetToOtherValue_returnsUpdatedValue() {
-    val atomicEnum =
-      AtomicEnum.create(
-        SimpleEnum.FIRST, possibilities = listOf(SimpleEnum.FIRST, SimpleEnum.SECOND)
-      )
-    atomicEnum.value = SimpleEnum.SECOND
-
-    val currentValue = atomicEnum.value
-
-    // The second enum value is valid.
-    assertThat(currentValue).isEqualTo(SimpleEnum.SECOND)
-  }
-
-  @Test
-  fun testSetValue_enumWithTwoConstants_toUnsupportedValue_failsSinceValueIsMissing() {
-    val atomicEnum =
-      AtomicEnum.create(
-        SimpleEnum.FIRST, possibilities = listOf(SimpleEnum.FIRST, SimpleEnum.SECOND)
-      )
-
-    val exception = assertThrows(IllegalArgumentException::class) {
-      // The third constant isn't among the supported constants.
-      atomicEnum.value = SimpleEnum.THIRD
-    }
-
-    assertThat(exception)
-      .hasMessageThat()
-      .contains("Constant is not in the supported list of constants")
-  }
-
-  @Test
-  fun testGetAndSetValue_enumWithOnlyInitialConstant_failsSinceValueIsMissing() {
-    val atomicEnum = AtomicEnum.create(SimpleEnum.FIRST, possibilities = listOf(SimpleEnum.FIRST))
-
-    val exception = assertThrows(IllegalArgumentException::class) {
-      atomicEnum.getAndSet(SimpleEnum.SECOND)
-    }
-
-    assertThat(exception)
-      .hasMessageThat()
-      .contains("Constant is not in the supported list of constants")
-  }
-
-  private enum class SimpleEnum {
-    FIRST,
-    SECOND,
-    THIRD
-  }
-
-  private enum class LargeEnum {
-    A,
-    B,
-    C,
-    D,
-    E,
-    F,
-    G,
-    H,
-    I,
-    J
-  }
-}
diff --git a/utility/src/test/java/org/oppia/android/util/threading/BUILD.bazel b/utility/src/test/java/org/oppia/android/util/threading/BUILD.bazel
deleted file mode 100644
index acbed30d4a1..00000000000
--- a/utility/src/test/java/org/oppia/android/util/threading/BUILD.bazel
+++ /dev/null
@@ -1,19 +0,0 @@
-"""
-Tests for general purpose utilities for multi-threading and concurrency.
-"""
-
-load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_test")
-
-kt_jvm_test(
-    name = "AtomicEnumTest",
-    srcs = ["AtomicEnumTest.kt"],
-    test_class = "org.oppia.android.util.threading.AtomicEnumTest",
-    deps = [
-        "//testing",
-        "//testing/src/main/java/org/oppia/android/testing/junit:oppia_parameterized_test_runner",
-        "//testing/src/main/java/org/oppia/android/testing/junit:parameterized_junit_test_runner",
-        "//third_party:com_google_truth_truth",
-        "//third_party:junit_junit",
-        "//utility/src/main/java/org/oppia/android/util/threading:atomic_enum",
-    ],
-)

From 32101210968267f8e1433070bb9402018d21b64a Mon Sep 17 00:00:00 2001
From: Ben Henning <ben@oppia.org>
Date: Thu, 9 Mar 2023 21:41:31 -0800
Subject: [PATCH 30/38] Some follow-up test fixes.

---
 .../LogReportWorkManagerInitializerTest.kt    | 25 ++++++++++++++-----
 .../logging/SyncStatusTestModuleTest.kt       | 25 ++++++++++++++-----
 2 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/LogReportWorkManagerInitializerTest.kt b/domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/LogReportWorkManagerInitializerTest.kt
index f86fdb4a147..79d93a35f6d 100644
--- a/domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/LogReportWorkManagerInitializerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/LogReportWorkManagerInitializerTest.kt
@@ -55,10 +55,12 @@ import org.robolectric.annotation.Config
 import org.robolectric.annotation.LooperMode
 import javax.inject.Inject
 import javax.inject.Singleton
+import org.oppia.android.util.data.DataProvidersInjector
+import org.oppia.android.util.data.DataProvidersInjectorProvider
 
 @RunWith(AndroidJUnit4::class)
 @LooperMode(LooperMode.Mode.PAUSED)
-@Config(manifest = Config.NONE)
+@Config(application = LogReportWorkManagerInitializerTest.TestApplication::class)
 class LogReportWorkManagerInitializerTest {
 
   @Inject
@@ -247,10 +249,7 @@ class LogReportWorkManagerInitializerTest {
   }
 
   private fun setUpTestApplicationComponent() {
-    DaggerLogReportWorkManagerInitializerTest_TestApplicationComponent.builder()
-      .setApplication(ApplicationProvider.getApplicationContext())
-      .build()
-      .inject(this)
+    ApplicationProvider.getApplicationContext<TestApplication>().inject(this)
   }
 
   // TODO(#89): Move this to a common test application component.
@@ -303,7 +302,7 @@ class LogReportWorkManagerInitializerTest {
       CpuPerformanceSnapshotterModule::class
     ]
   )
-  interface TestApplicationComponent {
+  interface TestApplicationComponent: DataProvidersInjector {
     @Component.Builder
     interface Builder {
       @BindsInstance
@@ -313,4 +312,18 @@ class LogReportWorkManagerInitializerTest {
 
     fun inject(logUploadWorkRequestTest: LogReportWorkManagerInitializerTest)
   }
+
+  class TestApplication : Application(), DataProvidersInjectorProvider {
+    private val component: TestApplicationComponent by lazy {
+      DaggerLogReportWorkManagerInitializerTest_TestApplicationComponent.builder()
+        .setApplication(this)
+        .build()
+    }
+
+    fun inject(test: LogReportWorkManagerInitializerTest) {
+      component.inject(test)
+    }
+
+    override fun getDataProvidersInjector() = component
+  }
 }
diff --git a/testing/src/test/java/org/oppia/android/testing/logging/SyncStatusTestModuleTest.kt b/testing/src/test/java/org/oppia/android/testing/logging/SyncStatusTestModuleTest.kt
index c1ce88dae6c..49c08cd3c43 100644
--- a/testing/src/test/java/org/oppia/android/testing/logging/SyncStatusTestModuleTest.kt
+++ b/testing/src/test/java/org/oppia/android/testing/logging/SyncStatusTestModuleTest.kt
@@ -25,13 +25,15 @@ import org.robolectric.annotation.Config
 import org.robolectric.annotation.LooperMode
 import javax.inject.Inject
 import javax.inject.Singleton
+import org.oppia.android.util.data.DataProvidersInjector
+import org.oppia.android.util.data.DataProvidersInjectorProvider
 
 /** Tests for [SyncStatusTestModule]. */
 // FunctionName: test names are conventionally named with underscores.
 @Suppress("FunctionName")
 @RunWith(AndroidJUnit4::class)
 @LooperMode(LooperMode.Mode.PAUSED)
-@Config(manifest = Config.NONE)
+@Config(application = SyncStatusTestModuleTest.TestApplication::class)
 class SyncStatusTestModuleTest {
   @Inject lateinit var syncStatusManager: SyncStatusManager
 
@@ -46,10 +48,7 @@ class SyncStatusTestModuleTest {
   }
 
   private fun setUpTestApplicationComponent() {
-    DaggerSyncStatusTestModuleTest_TestApplicationComponent.builder()
-      .setApplication(ApplicationProvider.getApplicationContext())
-      .build()
-      .inject(this)
+    ApplicationProvider.getApplicationContext<TestApplication>().inject(this)
   }
 
   // TODO(#89): Move this to a common test application component.
@@ -72,7 +71,7 @@ class SyncStatusTestModuleTest {
       RobolectricModule::class
     ]
   )
-  interface TestApplicationComponent {
+  interface TestApplicationComponent: DataProvidersInjector {
     @Component.Builder
     interface Builder {
       @BindsInstance
@@ -82,4 +81,18 @@ class SyncStatusTestModuleTest {
 
     fun inject(test: SyncStatusTestModuleTest)
   }
+
+  class TestApplication : Application(), DataProvidersInjectorProvider {
+    private val component: TestApplicationComponent by lazy {
+      DaggerSyncStatusTestModuleTest_TestApplicationComponent.builder()
+        .setApplication(this)
+        .build()
+    }
+
+    fun inject(test: SyncStatusTestModuleTest) {
+      component.inject(test)
+    }
+
+    override fun getDataProvidersInjector() = component
+  }
 }

From 3a8d645e5923516cfe13c272b3f480db1b729c26 Mon Sep 17 00:00:00 2001
From: Ben Henning <ben@oppia.org>
Date: Thu, 9 Mar 2023 21:50:38 -0800
Subject: [PATCH 31/38] Test fixes following develop update.

---
 .../oppia/android/app/player/state/StateFragmentTest.kt  | 9 +++++++++
 1 file changed, 9 insertions(+)

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 e6ece26d6c2..3bbe32c99dc 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
@@ -3941,6 +3941,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_interactions_noRadioItemSelected_defaultSelectionTextIsDisplayed() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -3956,6 +3957,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_interactions_oneRadioItemSelected_selectionTextIsDisplayed() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -3973,6 +3975,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_interactions_twoRadioItemSelected_selectionTextIsDisplayed() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -3991,6 +3994,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_interactions_maxRadioItemSelected_selectionTextIsDisplayed() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -4010,6 +4014,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_interactions_maxRadioItemSelected_nonSelectedCheckboxesAreDisabled() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -4050,6 +4055,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_interactions_maxItemSelected_deselectingReturnsYouMaySelectMoreChoices() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -4070,6 +4076,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_interactions_someItemSelected_deselectingReturnsPleaseSelectAllCorrect() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -4090,6 +4097,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_interactions_notSelectingMaxRadioItem_return_allOtherCheckBoxesEnabled() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playThroughPrototypeState1()
@@ -4137,6 +4145,7 @@ class StateFragmentTest {
 
   @Test
   fun testStateFragment_interactions_SelectingMaxItemAndOneBelow_returnNoOtherCheckBoxesEnabled() {
+    setUpTestWithStudyOff()
     launchForExploration(TEST_EXPLORATION_ID_2, shouldSavePartialProgress = false).use {
       startPlayingExploration()
       playThroughPrototypeState1()

From fbeeb0cb88e46c4690fa2a06bc04dde5876c45cc Mon Sep 17 00:00:00 2001
From: Ben Henning <ben@oppia.org>
Date: Thu, 9 Mar 2023 22:09:30 -0800
Subject: [PATCH 32/38] Gradle build & lint fixes.

---
 .../loguploader/LogReportWorkManagerInitializerTest.kt      | 6 +++---
 .../oppia/android/testing/logging/TestSyncStatusManager.kt  | 4 ++--
 .../android/testing/logging/SyncStatusTestModuleTest.kt     | 6 +++---
 .../main/java/org/oppia/android/util/logging/BUILD.bazel    | 1 -
 .../org/oppia/android/util/logging/SyncStatusManager.kt     | 3 +--
 .../org/oppia/android/util/logging/SyncStatusManagerImpl.kt | 5 ++---
 6 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/LogReportWorkManagerInitializerTest.kt b/domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/LogReportWorkManagerInitializerTest.kt
index 79d93a35f6d..cded74aa82b 100644
--- a/domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/LogReportWorkManagerInitializerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/LogReportWorkManagerInitializerTest.kt
@@ -44,6 +44,8 @@ import org.oppia.android.testing.threading.TestDispatcherModule
 import org.oppia.android.testing.time.FakeOppiaClockModule
 import org.oppia.android.util.caching.AssetModule
 import org.oppia.android.util.data.DataProviders
+import org.oppia.android.util.data.DataProvidersInjector
+import org.oppia.android.util.data.DataProvidersInjectorProvider
 import org.oppia.android.util.locale.LocaleProdModule
 import org.oppia.android.util.logging.LogUploader
 import org.oppia.android.util.logging.LoggerModule
@@ -55,8 +57,6 @@ import org.robolectric.annotation.Config
 import org.robolectric.annotation.LooperMode
 import javax.inject.Inject
 import javax.inject.Singleton
-import org.oppia.android.util.data.DataProvidersInjector
-import org.oppia.android.util.data.DataProvidersInjectorProvider
 
 @RunWith(AndroidJUnit4::class)
 @LooperMode(LooperMode.Mode.PAUSED)
@@ -302,7 +302,7 @@ class LogReportWorkManagerInitializerTest {
       CpuPerformanceSnapshotterModule::class
     ]
   )
-  interface TestApplicationComponent: DataProvidersInjector {
+  interface TestApplicationComponent : DataProvidersInjector {
     @Component.Builder
     interface Builder {
       @BindsInstance
diff --git a/testing/src/main/java/org/oppia/android/testing/logging/TestSyncStatusManager.kt b/testing/src/main/java/org/oppia/android/testing/logging/TestSyncStatusManager.kt
index 73f010adf8f..18488efd97e 100644
--- a/testing/src/main/java/org/oppia/android/testing/logging/TestSyncStatusManager.kt
+++ b/testing/src/main/java/org/oppia/android/testing/logging/TestSyncStatusManager.kt
@@ -1,9 +1,9 @@
 package org.oppia.android.testing.logging
 
 import org.oppia.android.app.model.OppiaEventLogs
-import org.oppia.android.data.persistence.PersistentCacheStore
 import org.oppia.android.util.data.AsyncDataSubscriptionManager
 import org.oppia.android.util.data.AsyncResult
+import org.oppia.android.util.data.DataProvider
 import org.oppia.android.util.data.DataProviders.Companion.transform
 import org.oppia.android.util.logging.SyncStatusManager
 import org.oppia.android.util.logging.SyncStatusManager.SyncStatus
@@ -44,7 +44,7 @@ class TestSyncStatusManager @Inject constructor(
 
   override fun getSyncStatus() = syncStatusProvider
 
-  override fun initializeEventLogStore(eventLogStore: PersistentCacheStore<OppiaEventLogs>) {
+  override fun initializeEventLogStore(eventLogStore: DataProvider<OppiaEventLogs>) {
     syncStatusManagerImpl.initializeEventLogStore(eventLogStore)
   }
 
diff --git a/testing/src/test/java/org/oppia/android/testing/logging/SyncStatusTestModuleTest.kt b/testing/src/test/java/org/oppia/android/testing/logging/SyncStatusTestModuleTest.kt
index 49c08cd3c43..9e4a588b9cd 100644
--- a/testing/src/test/java/org/oppia/android/testing/logging/SyncStatusTestModuleTest.kt
+++ b/testing/src/test/java/org/oppia/android/testing/logging/SyncStatusTestModuleTest.kt
@@ -17,6 +17,8 @@ import org.oppia.android.testing.TestLogReportingModule
 import org.oppia.android.testing.robolectric.RobolectricModule
 import org.oppia.android.testing.threading.TestDispatcherModule
 import org.oppia.android.testing.time.FakeOppiaClockModule
+import org.oppia.android.util.data.DataProvidersInjector
+import org.oppia.android.util.data.DataProvidersInjectorProvider
 import org.oppia.android.util.locale.LocaleProdModule
 import org.oppia.android.util.logging.LoggerModule
 import org.oppia.android.util.logging.SyncStatusManager
@@ -25,8 +27,6 @@ import org.robolectric.annotation.Config
 import org.robolectric.annotation.LooperMode
 import javax.inject.Inject
 import javax.inject.Singleton
-import org.oppia.android.util.data.DataProvidersInjector
-import org.oppia.android.util.data.DataProvidersInjectorProvider
 
 /** Tests for [SyncStatusTestModule]. */
 // FunctionName: test names are conventionally named with underscores.
@@ -71,7 +71,7 @@ class SyncStatusTestModuleTest {
       RobolectricModule::class
     ]
   )
-  interface TestApplicationComponent: DataProvidersInjector {
+  interface TestApplicationComponent : DataProvidersInjector {
     @Component.Builder
     interface Builder {
       @BindsInstance
diff --git a/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel b/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel
index 2835607af42..40eb95675a2 100644
--- a/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel
+++ b/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel
@@ -192,7 +192,6 @@ kt_android_library(
     ],
     visibility = ["//:oppia_api_visibility"],
     deps = [
-        "//data/src/main/java/org/oppia/android/data/persistence:cache_store",
         "//model/src/main/proto:event_logger_java_proto_lite",
         "//utility/src/main/java/org/oppia/android/util/data:data_provider",
     ],
diff --git a/utility/src/main/java/org/oppia/android/util/logging/SyncStatusManager.kt b/utility/src/main/java/org/oppia/android/util/logging/SyncStatusManager.kt
index 3f8f4a62b6a..6006c835c21 100644
--- a/utility/src/main/java/org/oppia/android/util/logging/SyncStatusManager.kt
+++ b/utility/src/main/java/org/oppia/android/util/logging/SyncStatusManager.kt
@@ -1,7 +1,6 @@
 package org.oppia.android.util.logging
 
 import org.oppia.android.app.model.OppiaEventLogs
-import org.oppia.android.data.persistence.PersistentCacheStore
 import org.oppia.android.util.data.DataProvider
 
 /**
@@ -28,7 +27,7 @@ interface SyncStatusManager {
    * This function must be called in order for [getSyncStatus] to behave correctly, and it must not
    * be called more than once. It can be called before or after [getSyncStatus].
    */
-  fun initializeEventLogStore(eventLogStore: PersistentCacheStore<OppiaEventLogs>)
+  fun initializeEventLogStore(eventLogStore: DataProvider<OppiaEventLogs>)
 
   /** Indicates that upstream code is beginning an event upload operation. */
   fun reportUploadingStarted()
diff --git a/utility/src/main/java/org/oppia/android/util/logging/SyncStatusManagerImpl.kt b/utility/src/main/java/org/oppia/android/util/logging/SyncStatusManagerImpl.kt
index 23123573f28..6bc9573b071 100644
--- a/utility/src/main/java/org/oppia/android/util/logging/SyncStatusManagerImpl.kt
+++ b/utility/src/main/java/org/oppia/android/util/logging/SyncStatusManagerImpl.kt
@@ -1,7 +1,6 @@
 package org.oppia.android.util.logging
 
 import org.oppia.android.app.model.OppiaEventLogs
-import org.oppia.android.data.persistence.PersistentCacheStore
 import org.oppia.android.util.data.AsyncDataSubscriptionManager
 import org.oppia.android.util.data.AsyncResult
 import org.oppia.android.util.data.DataProvider
@@ -30,7 +29,7 @@ class SyncStatusManagerImpl @Inject constructor(
   private val networkConnectionUtil: NetworkConnectionUtil,
   private val asyncDataSubscriptionManager: AsyncDataSubscriptionManager
 ) : SyncStatusManager {
-  private var eventLogStore: PersistentCacheStore<OppiaEventLogs>? = null
+  private var eventLogStore: DataProvider<OppiaEventLogs>? = null
   private val eventLogsDataProvider: DataProvider<OppiaEventLogs> get() {
     return eventLogStore ?: dataProviders.createInMemoryDataProvider(
       DEFAULT_EVENT_LOG_PROVIDER_ID, OppiaEventLogs::getDefaultInstance
@@ -45,7 +44,7 @@ class SyncStatusManagerImpl @Inject constructor(
 
   override fun getSyncStatus() = configurableSyncStatus
 
-  override fun initializeEventLogStore(eventLogStore: PersistentCacheStore<OppiaEventLogs>) {
+  override fun initializeEventLogStore(eventLogStore: DataProvider<OppiaEventLogs>) {
     check(this.eventLogStore == null) { "Attempting to initialize the log store a second time." }
     this.eventLogStore = eventLogStore
     // Note that changing the base provider automatically notifies subscribers, so no need to do

From 7ba388a3f0952f2e2478b3c66ab90152b0bb65a5 Mon Sep 17 00:00:00 2001
From: Ben Henning <ben@oppia.org>
Date: Thu, 9 Mar 2023 22:59:31 -0800
Subject: [PATCH 33/38] Fix testing module Gradle build.

This ignores TestSyncStatusManagerTest in Gradle since it doesn't
support sharing test classes across modules (at least in a clean way
like Bazel).
---
 testing/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/testing/build.gradle b/testing/build.gradle
index 9e502acee95..65e7a17590e 100644
--- a/testing/build.gradle
+++ b/testing/build.gradle
@@ -54,6 +54,7 @@ def filesToExclude = [
     '**/*InitializeDefaultLocaleRuleCustomContextTest*.kt',
     '**/*InitializeDefaultLocaleRuleOmissionTest*.kt',
     '**/*InitializeDefaultLocaleRuleTest*.kt',
+    '**/*TestSyncStatusManagerTest*.kt', // This depends on another module's test base.
 ]
 tasks.withType(SourceTask.class).configureEach {
   it.exclude(filesToExclude)

From 0f71b8cb3a1567814bf7f9dbeb98c9bd8923a487 Mon Sep 17 00:00:00 2001
From: Ben Henning <ben@oppia.org>
Date: Thu, 9 Mar 2023 23:54:59 -0800
Subject: [PATCH 34/38] Gate long-term event tracking.

This commit gates tracking events as 'uploaded' behind the learner study
analytics feature (since that feature exposes the learner analytics
page, it's the only time that tracking events in this way is actually
beneficial).

Tests have been updated & added to ensure that the functionality is
correctly gated behind the feature's platform parameter.
---
 .../analytics/AnalyticsController.kt          |  15 +-
 .../domain/oppialogger/analytics/BUILD.bazel  |   1 +
 .../analytics/AnalyticsControllerTest.kt      | 181 ++++++++++++++++--
 .../domain/oppialogger/analytics/BUILD.bazel  |   1 +
 model/src/main/proto/oppia_logger.proto       |   3 +-
 .../testing/logging/TestSyncStatusManager.kt  |   2 +
 6 files changed, 179 insertions(+), 24 deletions(-)

diff --git a/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsController.kt b/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsController.kt
index 7b01f402e8b..bb8bcf6c4b8 100644
--- a/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsController.kt
+++ b/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsController.kt
@@ -31,6 +31,8 @@ import org.oppia.android.util.logging.ExceptionLogger
 import org.oppia.android.util.logging.SyncStatusManager
 import org.oppia.android.util.networking.NetworkConnectionUtil
 import org.oppia.android.util.networking.NetworkConnectionUtil.ProdConnectionStatus.NONE
+import org.oppia.android.util.platformparameter.EnableLearnerStudyAnalytics
+import org.oppia.android.util.platformparameter.PlatformParameterValue
 import org.oppia.android.util.system.OppiaClock
 import org.oppia.android.util.threading.BackgroundDispatcher
 import org.oppia.android.util.threading.BlockingDispatcher
@@ -59,7 +61,8 @@ class AnalyticsController @Inject constructor(
   private val dataProviders: DataProviders,
   @EventLogStorageCacheSize private val eventLogStorageCacheSize: Int,
   @BlockingDispatcher private val blockingDispatcher: CoroutineDispatcher,
-  @BackgroundDispatcher private val backgroundDispatcher: CoroutineDispatcher
+  @BackgroundDispatcher private val backgroundDispatcher: CoroutineDispatcher,
+  @EnableLearnerStudyAnalytics private val enableLearnerStudyParam: PlatformParameterValue<Boolean>
 ) {
   // NOTE TO DEVELOPER: This log store should not be lazy since it needs to be primed as early as
   // possible. When this is created shouldn't affect event record integrity, but it can affect how
@@ -77,6 +80,8 @@ class AnalyticsController @Inject constructor(
       syncStatusManager.initializeEventLogStore(store)
     }
 
+  private val enableLearnerStudyAnalytics get() = enableLearnerStudyParam.value
+
   /**
    * Logs a high priority event defined by [eventContext] corresponding to time [timestamp].
    *
@@ -164,7 +169,9 @@ class AnalyticsController @Inject constructor(
       NONE -> cacheEventLog(eventLog)
       else -> {
         analyticsEventLogger.logEvent(eventLog)
-        recordUploadedEvent(eventLog)
+        if (enableLearnerStudyAnalytics) {
+          recordUploadedEvent(eventLog)
+        }
       }
     }
   }
@@ -300,7 +307,9 @@ class AnalyticsController @Inject constructor(
   private fun removeFirstEventLogFromStoreAsync(): Deferred<EventLog> {
     return eventLogStore.storeDataWithCustomChannelAsync(updateInMemoryCache = true) { eventLogs ->
       eventLogs.toBuilder().apply {
-        addUploadedEventLogs(eventLogs.eventLogsToUploadList.first())
+        if (enableLearnerStudyAnalytics) {
+          addUploadedEventLogs(eventLogs.eventLogsToUploadList.first())
+        }
         removeEventLogsToUpload(0)
       }.build() to eventLogs.eventLogsToUploadList.first()
     }.also {
diff --git a/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel b/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel
index 1c486e0f10c..316439404f7 100644
--- a/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel
+++ b/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel
@@ -28,6 +28,7 @@ kt_android_library(
         "//domain/src/main/java/org/oppia/android/domain/oppialogger:prod_module",
         "//domain/src/main/java/org/oppia/android/domain/translation:translation_controller",
         "//model/src/main/proto:event_logger_java_proto_lite",
+        "//utility",
         "//utility/src/main/java/org/oppia/android/util/data:data_provider",
         "//utility/src/main/java/org/oppia/android/util/logging:console_logger",
         "//utility/src/main/java/org/oppia/android/util/logging:event_logger",
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 34d0947f39b..76d5aaaf5b6 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
@@ -16,7 +16,6 @@ import kotlinx.coroutines.async
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import org.junit.Assert.fail
-import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.oppia.android.app.model.AppLanguageSelection
@@ -35,7 +34,6 @@ import org.oppia.android.domain.oppialogger.ExceptionLogStorageCacheSize
 import org.oppia.android.domain.oppialogger.LoggingIdentifierModule
 import org.oppia.android.domain.oppialogger.OppiaLogger
 import org.oppia.android.domain.oppialogger.PerformanceMetricsLogStorageCacheSize
-import org.oppia.android.domain.platformparameter.PlatformParameterModule
 import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule
 import org.oppia.android.domain.profile.ProfileManagementController
 import org.oppia.android.domain.translation.TranslationController
@@ -46,6 +44,7 @@ import org.oppia.android.testing.data.DataProviderTestMonitor
 import org.oppia.android.testing.logging.EventLogSubject.Companion.assertThat
 import org.oppia.android.testing.logging.SyncStatusTestModule
 import org.oppia.android.testing.logging.TestSyncStatusManager
+import org.oppia.android.testing.platformparameter.TestPlatformParameterModule
 import org.oppia.android.testing.robolectric.RobolectricModule
 import org.oppia.android.testing.threading.TestCoroutineDispatchers
 import org.oppia.android.testing.threading.TestDispatcherModule
@@ -113,13 +112,9 @@ class AnalyticsControllerTest {
   private val profileManagementController by lazy { profileManagementControllerProvider.get() }
   private val analyticsController by lazy { analyticsControllerProvider.get() }
 
-  @Before
-  fun setUp() {
-    setUpTestApplicationComponent()
-  }
-
   @Test
   fun testController_logImportantEvent_withQuestionContext_checkLogsEvent() {
+    setUpTestApplicationComponent()
     analyticsController.logImportantEvent(
       oppiaLogger.createOpenQuestionPlayerContext(
         TEST_QUESTION_ID,
@@ -140,6 +135,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_logImportantEvent_withExplorationContext_checkLogsEvent() {
+    setUpTestApplicationComponent()
     analyticsController.logImportantEvent(
       oppiaLogger.createOpenExplorationActivityContext(
         TEST_TOPIC_ID,
@@ -159,6 +155,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_logImportantEvent_withOpenInfoTabContext_checkLogsEvent() {
+    setUpTestApplicationComponent()
     analyticsController.logImportantEvent(
       oppiaLogger.createOpenInfoTabContext(TEST_TOPIC_ID), profileId = null, TEST_TIMESTAMP
     )
@@ -172,6 +169,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_logImportantEvent_withOpenPracticeTabContext_checkLogsEvent() {
+    setUpTestApplicationComponent()
     analyticsController.logImportantEvent(
       oppiaLogger.createOpenPracticeTabContext(TEST_TOPIC_ID), profileId = null, TEST_TIMESTAMP
     )
@@ -185,6 +183,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_logImportantEvent_withOpenLessonsTabContext_checkLogsEvent() {
+    setUpTestApplicationComponent()
     analyticsController.logImportantEvent(
       oppiaLogger.createOpenLessonsTabContext(TEST_TOPIC_ID), profileId = null, TEST_TIMESTAMP
     )
@@ -198,6 +197,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_logImportantEvent_withOpenRevisionTabContext_checkLogsEvent() {
+    setUpTestApplicationComponent()
     analyticsController.logImportantEvent(
       oppiaLogger.createOpenRevisionTabContext(TEST_TOPIC_ID), profileId = null, TEST_TIMESTAMP
     )
@@ -211,6 +211,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_logImportantEvent_withStoryContext_checkLogsEvent() {
+    setUpTestApplicationComponent()
     analyticsController.logImportantEvent(
       oppiaLogger.createOpenStoryActivityContext(TEST_TOPIC_ID, TEST_STORY_ID),
       profileId = null,
@@ -226,6 +227,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_logImportantEvent_withRevisionContext_checkLogsEvent() {
+    setUpTestApplicationComponent()
     analyticsController.logImportantEvent(
       oppiaLogger.createOpenRevisionCardContext(TEST_TOPIC_ID, TEST_SUB_TOPIC_ID),
       profileId = null,
@@ -241,6 +243,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_logImportantEvent_withConceptCardContext_checkLogsEvent() {
+    setUpTestApplicationComponent()
     analyticsController.logImportantEvent(
       oppiaLogger.createOpenConceptCardContext(TEST_SKILL_ID), profileId = null, TEST_TIMESTAMP
     )
@@ -254,6 +257,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testLogImportantEvent_forOpenHomeEvent_logsEssentialEventWithCurrentTime() {
+    setUpTestApplicationComponent()
     val openHomeEventContext = oppiaLogger.createOpenHomeContext()
 
     analyticsController.logImportantEvent(openHomeEventContext, profileId = null, TEST_TIMESTAMP)
@@ -266,6 +270,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_logImportantEvent_nullProfileId_hasDefaultLanguageSettings() {
+    setUpTestApplicationComponent()
     val openHomeEventContext = oppiaLogger.createOpenHomeContext()
     // Create a new profile & set its language settings, but don't use it when logging an event.
     val profileId = addNewProfileAndLogIn()
@@ -285,6 +290,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_logImportantEvent_profileWithNoLangSettings_hasDefaultLanguageSettings() {
+    setUpTestApplicationComponent()
     val openHomeEventContext = oppiaLogger.createOpenHomeContext()
     // Create a profile without any language settings.
     val profileId = addNewProfileAndLogIn()
@@ -302,6 +308,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_logImportantEvent_profileWithLangSettings_hasCorrectLanguageSettings() {
+    setUpTestApplicationComponent()
     val openHomeEventContext = oppiaLogger.createOpenHomeContext()
     val profileId = addNewProfileAndLogIn()
     ensureAppLanguageIsUpdatedTo(profileId, ENGLISH)
@@ -326,6 +333,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_logImportantEvent_noProfile_hasNoProfileId() {
+    setUpTestApplicationComponent()
     analyticsController.logImportantEvent(
       oppiaLogger.createOpenConceptCardContext(TEST_SKILL_ID), profileId = null, TEST_TIMESTAMP
     )
@@ -337,6 +345,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_logImportantEvent_withProfile_includesProfileId() {
+    setUpTestApplicationComponent()
     val profileId = addNewProfileAndLogIn()
     analyticsController.logImportantEvent(
       oppiaLogger.createOpenConceptCardContext(TEST_SKILL_ID), profileId, TEST_TIMESTAMP
@@ -350,6 +359,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_logLowPriorityEvent_withQuestionContext_checkLogsEvent() {
+    setUpTestApplicationComponent()
     analyticsController.logLowPriorityEvent(
       oppiaLogger.createOpenQuestionPlayerContext(
         TEST_QUESTION_ID,
@@ -370,6 +380,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_logLowPriorityEvent_withExplorationContext_checkLogsEvent() {
+    setUpTestApplicationComponent()
     analyticsController.logLowPriorityEvent(
       oppiaLogger.createOpenExplorationActivityContext(
         TEST_TOPIC_ID,
@@ -389,6 +400,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_logLowPriorityEvent_withOpenInfoTabContext_checkLogsEvent() {
+    setUpTestApplicationComponent()
     analyticsController.logLowPriorityEvent(
       oppiaLogger.createOpenInfoTabContext(TEST_TOPIC_ID), profileId = null, TEST_TIMESTAMP
     )
@@ -402,6 +414,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_logLowPriorityEvent_withOpenPracticeTabContext_checkLogsEvent() {
+    setUpTestApplicationComponent()
     analyticsController.logLowPriorityEvent(
       oppiaLogger.createOpenPracticeTabContext(TEST_TOPIC_ID), profileId = null, TEST_TIMESTAMP
     )
@@ -415,6 +428,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_logLowPriorityEvent_withOpenLessonsTabContext_checkLogsEvent() {
+    setUpTestApplicationComponent()
     analyticsController.logLowPriorityEvent(
       oppiaLogger.createOpenLessonsTabContext(TEST_TOPIC_ID), profileId = null, TEST_TIMESTAMP
     )
@@ -428,6 +442,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_logLowPriorityEvent_withOpenRevisionTabContext_checkLogsEvent() {
+    setUpTestApplicationComponent()
     analyticsController.logLowPriorityEvent(
       oppiaLogger.createOpenRevisionTabContext(TEST_TOPIC_ID), profileId = null, TEST_TIMESTAMP
     )
@@ -441,6 +456,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_logLowPriorityEvent_withStoryContext_checkLogsEvent() {
+    setUpTestApplicationComponent()
     analyticsController.logLowPriorityEvent(
       oppiaLogger.createOpenStoryActivityContext(TEST_TOPIC_ID, TEST_STORY_ID),
       profileId = null,
@@ -456,6 +472,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_logLowPriorityEvent_withRevisionContext_checkLogsEvent() {
+    setUpTestApplicationComponent()
     analyticsController.logLowPriorityEvent(
       oppiaLogger.createOpenRevisionCardContext(TEST_TOPIC_ID, TEST_SUB_TOPIC_ID),
       profileId = null,
@@ -471,6 +488,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_logLowPriorityEvent_withConceptCardContext_checkLogsEvent() {
+    setUpTestApplicationComponent()
     analyticsController.logLowPriorityEvent(
       oppiaLogger.createOpenConceptCardContext(TEST_SKILL_ID), profileId = null, TEST_TIMESTAMP
     )
@@ -487,6 +505,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_logImportantEvent_withNoNetwork_checkLogsEventToStore() {
+    setUpTestApplicationComponent()
     networkConnectionUtil.setCurrentConnectionStatus(NONE)
     analyticsController.logImportantEvent(
       oppiaLogger.createOpenQuestionPlayerContext(
@@ -511,6 +530,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_logLowPriorityEvent_withNoNetwork_checkLogsEventToStore() {
+    setUpTestApplicationComponent()
     networkConnectionUtil.setCurrentConnectionStatus(NONE)
     analyticsController.logLowPriorityEvent(
       oppiaLogger.createOpenQuestionPlayerContext(
@@ -535,6 +555,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_logLowPriorityEvent_nullProfileId_hasDefaultLanguageSettings() {
+    setUpTestApplicationComponent()
     val openHomeEventContext = oppiaLogger.createOpenHomeContext()
     // Create a new profile & set its language settings, but don't use it when logging an event.
     val profileId = addNewProfileAndLogIn()
@@ -554,6 +575,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_logLowPriorityEvent_profileWithNoLangSettings_hasDefaultLanguageSettings() {
+    setUpTestApplicationComponent()
     val openHomeEventContext = oppiaLogger.createOpenHomeContext()
     // Create a profile without any language settings.
     val profileId = addNewProfileAndLogIn()
@@ -571,6 +593,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_logLowPriorityEvent_profileWithLangSettings_hasCorrectLanguageSettings() {
+    setUpTestApplicationComponent()
     val openHomeEventContext = oppiaLogger.createOpenHomeContext()
     val profileId = addNewProfileAndLogIn()
     ensureAppLanguageIsUpdatedTo(profileId, ENGLISH)
@@ -595,6 +618,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_logPriorityEvent_noProfile_hasNoProfileId() {
+    setUpTestApplicationComponent()
     analyticsController.logLowPriorityEvent(
       oppiaLogger.createOpenConceptCardContext(TEST_SKILL_ID), profileId = null, TEST_TIMESTAMP
     )
@@ -606,6 +630,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_logPriorityEvent_withProfile_includesProfileId() {
+    setUpTestApplicationComponent()
     val profileId = addNewProfileAndLogIn()
     analyticsController.logLowPriorityEvent(
       oppiaLogger.createOpenConceptCardContext(TEST_SKILL_ID), profileId, TEST_TIMESTAMP
@@ -619,6 +644,20 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_logImportantEvent_withNoNetwork_exceedLimit_checkEventLogStoreSize() {
+    setUpTestApplicationComponent()
+    networkConnectionUtil.setCurrentConnectionStatus(NONE)
+    logFourEvents()
+
+    val eventLogsProvider = analyticsController.getEventLogStore()
+
+    val eventLogs = monitorFactory.waitForNextSuccessfulResult(eventLogsProvider)
+    assertThat(eventLogs.eventLogsToUploadList).hasSize(2)
+    assertThat(eventLogs.uploadedEventLogsList).isEmpty()
+  }
+
+  @Test
+  fun testController_logImportantEvent_withNoNetwork_exceedLimit_studyOn_checkEventLogStoreSize() {
+    setUpTestApplicationComponentWithLearnerStudyAnalyticsEnabled()
     networkConnectionUtil.setCurrentConnectionStatus(NONE)
     logFourEvents()
 
@@ -626,11 +665,12 @@ class AnalyticsControllerTest {
 
     val eventLogs = monitorFactory.waitForNextSuccessfulResult(eventLogsProvider)
     assertThat(eventLogs.eventLogsToUploadList).hasSize(2)
-    assertThat(eventLogs.uploadedEventLogsList).hasSize(0)
+    assertThat(eventLogs.uploadedEventLogsList).isEmpty()
   }
 
   @Test
   fun testController_logImportantEvent_logLowPriorityEvent_withNoNetwork_checkOrderinCache() {
+    setUpTestApplicationComponent()
     networkConnectionUtil.setCurrentConnectionStatus(NONE)
     analyticsController.logLowPriorityEvent(
       oppiaLogger.createOpenQuestionPlayerContext(
@@ -667,6 +707,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_logImportantEvent_switchToNoNetwork_logLowPriorityEvent_checkManagement() {
+    setUpTestApplicationComponent()
     analyticsController.logImportantEvent(
       oppiaLogger.createOpenQuestionPlayerContext(
         TEST_QUESTION_ID,
@@ -708,6 +749,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_logEvents_exceedLimit_withNoNetwork_checkCorrectEventIsEvicted() {
+    setUpTestApplicationComponent()
     networkConnectionUtil.setCurrentConnectionStatus(NONE)
     logFourEvents()
 
@@ -733,7 +775,9 @@ class AnalyticsControllerTest {
   }
 
   @Test
-  fun testController_logEvent_withoutNetwork_verifySyncStatusIsUnchanged() {
+  fun testController_logEvent_withoutNetwork_studyOn_verifySyncStatusIsUnchanged() {
+    // Sync statuses only make sense in the context of the learner study feature being enabled.
+    setUpTestApplicationComponentWithLearnerStudyAnalyticsEnabled()
     networkConnectionUtil.setCurrentConnectionStatus(NONE)
     analyticsController.logImportantEvent(
       oppiaLogger.createOpenQuestionPlayerContext(
@@ -752,7 +796,9 @@ class AnalyticsControllerTest {
   }
 
   @Test
-  fun testController_logEvent_verifySyncStatusChangesToRepresentLoggedEvent() {
+  fun testController_logEvent_studyOn_verifySyncStatusChangesToRepresentLoggedEvent() {
+    // Sync statuses only make sense in the context of the learner study feature being enabled.
+    setUpTestApplicationComponentWithLearnerStudyAnalyticsEnabled()
     analyticsController.logImportantEvent(
       oppiaLogger.createOpenQuestionPlayerContext(
         TEST_QUESTION_ID,
@@ -771,7 +817,23 @@ class AnalyticsControllerTest {
   }
 
   @Test
-  fun testController_logImportantEvent_recordsEventAsUploaded() {
+  fun testController_logImportantEvent_studyOff_doesNotRecordEventsAsUploaded() {
+    setUpTestApplicationComponent()
+    // The important event should be marked as uploaded.
+    analyticsController.logImportantEvent(oppiaLogger.createOpenHomeContext(), profileId = null)
+    testCoroutineDispatchers.runCurrent()
+
+    // No events should be marked as uploaded when the study is off.
+    val logsProvider = analyticsController.getEventLogStore()
+    val uploadedLogs =
+      monitorFactory.waitForNextSuccessfulResult(logsProvider).uploadedEventLogsList
+    assertThat(uploadedLogs).isEmpty()
+  }
+
+  @Test
+  fun testController_logImportantEvent_studyOn_recordsEventAsUploaded() {
+    // Events are only tracked as uploaded when the learner study feature being enabled.
+    setUpTestApplicationComponentWithLearnerStudyAnalyticsEnabled()
     // The important event should be marked as uploaded.
     analyticsController.logImportantEvent(oppiaLogger.createOpenHomeContext(), profileId = null)
     testCoroutineDispatchers.runCurrent()
@@ -785,6 +847,19 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_uploadEventLogs_noLogs_cacheUnchanged() {
+    setUpTestApplicationComponent()
+    val monitor = monitorFactory.createMonitor(analyticsController.getEventLogStore())
+
+    monitorFactory.ensureDataProviderExecutes(analyticsController.uploadEventLogs())
+
+    val logs = monitor.ensureNextResultIsSuccess()
+    assertThat(logs.eventLogsToUploadList).isEmpty()
+    assertThat(logs.uploadedEventLogsList).isEmpty()
+  }
+
+  @Test
+  fun testController_uploadEventLogs_noLogs_studyOn_cacheUnchanged() {
+    setUpTestApplicationComponentWithLearnerStudyAnalyticsEnabled()
     val monitor = monitorFactory.createMonitor(analyticsController.getEventLogStore())
 
     monitorFactory.ensureDataProviderExecutes(analyticsController.uploadEventLogs())
@@ -796,6 +871,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_uploadEventLogs_noLogs_returnsPendingAndSimpleSuccessDataProvider() {
+    setUpTestApplicationComponent()
     val uploadResults = monitorFactory.waitForAllNextResults {
       analyticsController.uploadEventLogs()
     }
@@ -806,7 +882,9 @@ class AnalyticsControllerTest {
   }
 
   @Test
-  fun testController_uploadEventLogs_withPreviousLogs_setsSyncStatusToUploadingThenUploaded() {
+  fun testController_uploadEventLogs_withPreviousLogs_studyOn_setsSyncStatusToUploadingUploaded() {
+    // Sync statuses only make sense in the context of the learner study feature being enabled.
+    setUpTestApplicationComponentWithLearnerStudyAnalyticsEnabled()
     logTwoEvents()
 
     monitorFactory.waitForAllNextResults { analyticsController.uploadEventLogs() }
@@ -823,7 +901,9 @@ class AnalyticsControllerTest {
   }
 
   @Test
-  fun testController_uploadEventLogs_withLogs_setsSyncStatusToUploadingThenUploaded() {
+  fun testController_uploadEventLogs_withLogs_studyOn_setsSyncStatusToUploadingThenUploaded() {
+    // Sync statuses only make sense in the context of the learner study feature being enabled.
+    setUpTestApplicationComponentWithLearnerStudyAnalyticsEnabled()
     logTwoEventsOffline()
 
     monitorFactory.waitForAllNextResults { analyticsController.uploadEventLogs() }
@@ -835,19 +915,35 @@ class AnalyticsControllerTest {
   }
 
   @Test
-  fun testController_uploadEventLogs_withLogs_removesEventsForUploading() {
+  fun testController_uploadEventLogs_withLogs_studyOff_removesEventsButDoesNotTrackThem() {
+    setUpTestApplicationComponent()
+    logTwoEventsOffline()
+
+    monitorFactory.waitForAllNextResults { analyticsController.uploadEventLogs() }
+
+    // No events should be marked as uploaded when the study is off.
+    val eventLogs =
+      monitorFactory.waitForNextSuccessfulResult(analyticsController.getEventLogStore())
+    assertThat(eventLogs.eventLogsToUploadList).isEmpty()
+    assertThat(eventLogs.uploadedEventLogsList).isEmpty()
+  }
+
+  @Test
+  fun testController_uploadEventLogs_withLogs_studyOn_removesEventsForUploading() {
+    setUpTestApplicationComponentWithLearnerStudyAnalyticsEnabled()
     logTwoEventsOffline()
 
     monitorFactory.waitForAllNextResults { analyticsController.uploadEventLogs() }
 
     val eventLogs =
       monitorFactory.waitForNextSuccessfulResult(analyticsController.getEventLogStore())
-    assertThat(eventLogs.eventLogsToUploadList).hasSize(0)
+    assertThat(eventLogs.eventLogsToUploadList).isEmpty()
     assertThat(eventLogs.uploadedEventLogsList).hasSize(2)
   }
 
   @Test
   fun testController_uploadEventLogs_withPreviousLogs_recordsEventsAsUploaded() {
+    setUpTestApplicationComponent()
     logTwoEvents()
 
     monitorFactory.waitForAllNextResults { analyticsController.uploadEventLogs() }
@@ -857,6 +953,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_uploadEventLogs_withLogs_recordsEventsAsUploaded() {
+    setUpTestApplicationComponent()
     logTwoEventsOffline()
 
     monitorFactory.waitForAllNextResults { analyticsController.uploadEventLogs() }
@@ -866,6 +963,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_uploadEventLogs_withPreviousLogs_returnsProgressContext() {
+    setUpTestApplicationComponent()
     logTwoEvents()
 
     val uploadResults = monitorFactory.waitForAllNextResults {
@@ -880,6 +978,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_uploadEventLogs_withLogs_returnsProgressContext() {
+    setUpTestApplicationComponent()
     logTwoEventsOffline()
 
     val uploadResults = monitorFactory.waitForAllNextResults {
@@ -913,6 +1012,19 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_uploadEventLogsAndWait_noLogs_cacheUnchanged() {
+    setUpTestApplicationComponent()
+    val monitor = monitorFactory.createMonitor(analyticsController.getEventLogStore())
+
+    runSynchronously { analyticsController.uploadEventLogsAndWait() }
+
+    val logs = monitor.ensureNextResultIsSuccess()
+    assertThat(logs.eventLogsToUploadList).isEmpty()
+    assertThat(logs.uploadedEventLogsList).isEmpty()
+  }
+
+  @Test
+  fun testController_uploadEventLogsAndWait_noLogs_studyOn_cacheUnchanged() {
+    setUpTestApplicationComponentWithLearnerStudyAnalyticsEnabled()
     val monitor = monitorFactory.createMonitor(analyticsController.getEventLogStore())
 
     runSynchronously { analyticsController.uploadEventLogsAndWait() }
@@ -923,7 +1035,9 @@ class AnalyticsControllerTest {
   }
 
   @Test
-  fun testController_uploadEventLogsAndWait_withPrevLogs_setsSyncStatusToUploadingThenUploaded() {
+  fun testController_uploadEventLogsAndWait_prevLogs_studyOn_setsSyncStatusToUploadingUploaded() {
+    // Sync statuses only make sense in the context of the learner study feature being enabled.
+    setUpTestApplicationComponentWithLearnerStudyAnalyticsEnabled()
     logTwoEvents()
 
     runSynchronously { analyticsController.uploadEventLogsAndWait() }
@@ -942,7 +1056,9 @@ class AnalyticsControllerTest {
   }
 
   @Test
-  fun testController_uploadEventLogsAndWait_withLogs_setsSyncStatusToUploadingThenUploaded() {
+  fun testController_uploadEventLogsAndWait_withLogs_studyOn_setsSyncStatusToUploadingUploaded() {
+    // Sync statuses only make sense in the context of the learner study feature being enabled.
+    setUpTestApplicationComponentWithLearnerStudyAnalyticsEnabled()
     logTwoEventsOffline()
 
     runSynchronously { analyticsController.uploadEventLogsAndWait() }
@@ -954,19 +1070,35 @@ class AnalyticsControllerTest {
   }
 
   @Test
-  fun testController_uploadEventLogsAndWait_withLogs_removesEventsForUploading() {
+  fun testController_uploadEventLogsAndWait_withLogs_studyOff_removesEventsButDoesNotTrackThem() {
+    setUpTestApplicationComponent()
+    logTwoEventsOffline()
+
+    runSynchronously { analyticsController.uploadEventLogsAndWait() }
+
+    // No events should be marked as uploaded when the study is off.
+    val eventLogs =
+      monitorFactory.waitForNextSuccessfulResult(analyticsController.getEventLogStore())
+    assertThat(eventLogs.eventLogsToUploadList).isEmpty()
+    assertThat(eventLogs.uploadedEventLogsList).isEmpty()
+  }
+
+  @Test
+  fun testController_uploadEventLogsAndWait_withLogs_studyOn_removesEventsForUploading() {
+    setUpTestApplicationComponentWithLearnerStudyAnalyticsEnabled()
     logTwoEventsOffline()
 
     runSynchronously { analyticsController.uploadEventLogsAndWait() }
 
     val eventLogs =
       monitorFactory.waitForNextSuccessfulResult(analyticsController.getEventLogStore())
-    assertThat(eventLogs.eventLogsToUploadList).hasSize(0)
+    assertThat(eventLogs.eventLogsToUploadList).isEmpty()
     assertThat(eventLogs.uploadedEventLogsList).hasSize(2)
   }
 
   @Test
   fun testController_uploadEventLogsAndWait_withPreviousLogs_recordsEventsAsUploaded() {
+    setUpTestApplicationComponent()
     logTwoEvents()
 
     runSynchronously { analyticsController.uploadEventLogsAndWait() }
@@ -976,6 +1108,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_uploadEventLogsAndWait_withLogs_recordsEventsAsUploaded() {
+    setUpTestApplicationComponent()
     logTwoEventsOffline()
 
     runSynchronously { analyticsController.uploadEventLogsAndWait() }
@@ -985,6 +1118,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_cachedEventsFromLastAppInstance_logNewEvent_onlyLatestEventLogged() {
+    setUpTestApplicationComponent()
     // Simulate events being logged in a previous instance of the app.
     logTwoCachedEventsDirectlyOnDisk()
 
@@ -997,6 +1131,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_cachedEventsFromLastAppInstance_logNewEvent_thenForceSync_everythingUploads() {
+    setUpTestApplicationComponent()
     // Simulate events being logged in a previous instance of the app.
     logTwoCachedEventsDirectlyOnDisk()
     analyticsController.logImportantEvent(oppiaLogger.createOpenHomeContext(), profileId = null)
@@ -1014,6 +1149,12 @@ class AnalyticsControllerTest {
   }
 
   private fun setUpTestApplicationComponent() {
+    TestPlatformParameterModule.forceEnableLearnerStudyAnalytics(false)
+    ApplicationProvider.getApplicationContext<TestApplication>().inject(this)
+  }
+
+  private fun setUpTestApplicationComponentWithLearnerStudyAnalyticsEnabled() {
+    TestPlatformParameterModule.forceEnableLearnerStudyAnalytics(true)
     ApplicationProvider.getApplicationContext<TestApplication>().inject(this)
   }
 
@@ -1226,7 +1367,7 @@ class AnalyticsControllerTest {
       TestModule::class, TestLogReportingModule::class, RobolectricModule::class,
       TestDispatcherModule::class, TestLogStorageModule::class,
       NetworkConnectionUtilDebugModule::class, LocaleProdModule::class, FakeOppiaClockModule::class,
-      PlatformParameterModule::class, PlatformParameterSingletonModule::class,
+      TestPlatformParameterModule::class, PlatformParameterSingletonModule::class,
       LoggingIdentifierModule::class, SyncStatusTestModule::class, AssetModule::class
     ]
   )
diff --git a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel
index df824ae8075..346231f3738 100644
--- a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel
+++ b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/BUILD.bazel
@@ -20,6 +20,7 @@ oppia_android_test(
         "//testing/src/main/java/org/oppia/android/testing/logging:event_log_subject",
         "//testing/src/main/java/org/oppia/android/testing/logging:sync_status_test_module",
         "//testing/src/main/java/org/oppia/android/testing/logging:test_sync_status_manager",
+        "//testing/src/main/java/org/oppia/android/testing/platformparameter:test_module",
         "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module",
         "//testing/src/main/java/org/oppia/android/testing/threading:test_coroutine_dispatchers",
         "//testing/src/main/java/org/oppia/android/testing/threading:test_module",
diff --git a/model/src/main/proto/oppia_logger.proto b/model/src/main/proto/oppia_logger.proto
index 92cbf713735..31d769946a3 100644
--- a/model/src/main/proto/oppia_logger.proto
+++ b/model/src/main/proto/oppia_logger.proto
@@ -354,7 +354,8 @@ message OppiaEventLogs {
   // app not have internet connectivity at the time of wanting to originally log the event.
   repeated EventLog event_logs_to_upload = 1;
 
-  // Contains all events that have been uploaded remotely to the analytics service.
+  // Contains all events that have been uploaded remotely to the analytics service. This is only
+  // used for special builds of the app that have additional telemetry diagnostics enabled.
   repeated EventLog uploaded_event_logs = 2;
 }
 
diff --git a/testing/src/main/java/org/oppia/android/testing/logging/TestSyncStatusManager.kt b/testing/src/main/java/org/oppia/android/testing/logging/TestSyncStatusManager.kt
index 18488efd97e..5b7a29b9f2d 100644
--- a/testing/src/main/java/org/oppia/android/testing/logging/TestSyncStatusManager.kt
+++ b/testing/src/main/java/org/oppia/android/testing/logging/TestSyncStatusManager.kt
@@ -19,6 +19,8 @@ import javax.inject.Singleton
 
 private const val STATUS_PROVIDER_ID = "TestSyncStatusManager.sync_status_provider"
 
+// TODO(#59): Move this & its test to be a testing package near SyncStatusManagerImpl to avoid
+//  cross-codebase test dependency sharing.
 /**
  * A test-only implementation of [SyncStatusManager] that uses a real implementation internally, but
  * tracks all sync statuses that are either produced by the real [SyncStatusManagerImpl] or are

From 679411e298815392b91a9daa68fbee0b271216d2 Mon Sep 17 00:00:00 2001
From: Ben Henning <ben@oppia.org>
Date: Fri, 10 Mar 2023 00:24:08 -0800
Subject: [PATCH 35/38] More test fixes & clean-up, per event gating.

---
 .../analytics/AnalyticsControllerTest.kt      | 39 +++++++---------
 .../oppialogger/loguploader/BUILD.bazel       |  1 +
 .../loguploader/LogUploadWorkerTest.kt        | 45 ++++++++++---------
 3 files changed, 42 insertions(+), 43 deletions(-)

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 76d5aaaf5b6..935cf57e88a 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
@@ -657,7 +657,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_logImportantEvent_withNoNetwork_exceedLimit_studyOn_checkEventLogStoreSize() {
-    setUpTestApplicationComponentWithLearnerStudyAnalyticsEnabled()
+    setUpTestApplicationComponent(enableLearnerStudyAnalytics = true)
     networkConnectionUtil.setCurrentConnectionStatus(NONE)
     logFourEvents()
 
@@ -777,7 +777,7 @@ class AnalyticsControllerTest {
   @Test
   fun testController_logEvent_withoutNetwork_studyOn_verifySyncStatusIsUnchanged() {
     // Sync statuses only make sense in the context of the learner study feature being enabled.
-    setUpTestApplicationComponentWithLearnerStudyAnalyticsEnabled()
+    setUpTestApplicationComponent(enableLearnerStudyAnalytics = true)
     networkConnectionUtil.setCurrentConnectionStatus(NONE)
     analyticsController.logImportantEvent(
       oppiaLogger.createOpenQuestionPlayerContext(
@@ -798,7 +798,7 @@ class AnalyticsControllerTest {
   @Test
   fun testController_logEvent_studyOn_verifySyncStatusChangesToRepresentLoggedEvent() {
     // Sync statuses only make sense in the context of the learner study feature being enabled.
-    setUpTestApplicationComponentWithLearnerStudyAnalyticsEnabled()
+    setUpTestApplicationComponent(enableLearnerStudyAnalytics = true)
     analyticsController.logImportantEvent(
       oppiaLogger.createOpenQuestionPlayerContext(
         TEST_QUESTION_ID,
@@ -818,7 +818,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_logImportantEvent_studyOff_doesNotRecordEventsAsUploaded() {
-    setUpTestApplicationComponent()
+    setUpTestApplicationComponent(enableLearnerStudyAnalytics = false)
     // The important event should be marked as uploaded.
     analyticsController.logImportantEvent(oppiaLogger.createOpenHomeContext(), profileId = null)
     testCoroutineDispatchers.runCurrent()
@@ -833,7 +833,7 @@ class AnalyticsControllerTest {
   @Test
   fun testController_logImportantEvent_studyOn_recordsEventAsUploaded() {
     // Events are only tracked as uploaded when the learner study feature being enabled.
-    setUpTestApplicationComponentWithLearnerStudyAnalyticsEnabled()
+    setUpTestApplicationComponent(enableLearnerStudyAnalytics = true)
     // The important event should be marked as uploaded.
     analyticsController.logImportantEvent(oppiaLogger.createOpenHomeContext(), profileId = null)
     testCoroutineDispatchers.runCurrent()
@@ -859,7 +859,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_uploadEventLogs_noLogs_studyOn_cacheUnchanged() {
-    setUpTestApplicationComponentWithLearnerStudyAnalyticsEnabled()
+    setUpTestApplicationComponent(enableLearnerStudyAnalytics = true)
     val monitor = monitorFactory.createMonitor(analyticsController.getEventLogStore())
 
     monitorFactory.ensureDataProviderExecutes(analyticsController.uploadEventLogs())
@@ -884,7 +884,7 @@ class AnalyticsControllerTest {
   @Test
   fun testController_uploadEventLogs_withPreviousLogs_studyOn_setsSyncStatusToUploadingUploaded() {
     // Sync statuses only make sense in the context of the learner study feature being enabled.
-    setUpTestApplicationComponentWithLearnerStudyAnalyticsEnabled()
+    setUpTestApplicationComponent(enableLearnerStudyAnalytics = true)
     logTwoEvents()
 
     monitorFactory.waitForAllNextResults { analyticsController.uploadEventLogs() }
@@ -903,7 +903,7 @@ class AnalyticsControllerTest {
   @Test
   fun testController_uploadEventLogs_withLogs_studyOn_setsSyncStatusToUploadingThenUploaded() {
     // Sync statuses only make sense in the context of the learner study feature being enabled.
-    setUpTestApplicationComponentWithLearnerStudyAnalyticsEnabled()
+    setUpTestApplicationComponent(enableLearnerStudyAnalytics = true)
     logTwoEventsOffline()
 
     monitorFactory.waitForAllNextResults { analyticsController.uploadEventLogs() }
@@ -916,7 +916,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_uploadEventLogs_withLogs_studyOff_removesEventsButDoesNotTrackThem() {
-    setUpTestApplicationComponent()
+    setUpTestApplicationComponent(enableLearnerStudyAnalytics = false)
     logTwoEventsOffline()
 
     monitorFactory.waitForAllNextResults { analyticsController.uploadEventLogs() }
@@ -930,7 +930,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_uploadEventLogs_withLogs_studyOn_removesEventsForUploading() {
-    setUpTestApplicationComponentWithLearnerStudyAnalyticsEnabled()
+    setUpTestApplicationComponent(enableLearnerStudyAnalytics = true)
     logTwoEventsOffline()
 
     monitorFactory.waitForAllNextResults { analyticsController.uploadEventLogs() }
@@ -1024,7 +1024,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_uploadEventLogsAndWait_noLogs_studyOn_cacheUnchanged() {
-    setUpTestApplicationComponentWithLearnerStudyAnalyticsEnabled()
+    setUpTestApplicationComponent(enableLearnerStudyAnalytics = true)
     val monitor = monitorFactory.createMonitor(analyticsController.getEventLogStore())
 
     runSynchronously { analyticsController.uploadEventLogsAndWait() }
@@ -1037,7 +1037,7 @@ class AnalyticsControllerTest {
   @Test
   fun testController_uploadEventLogsAndWait_prevLogs_studyOn_setsSyncStatusToUploadingUploaded() {
     // Sync statuses only make sense in the context of the learner study feature being enabled.
-    setUpTestApplicationComponentWithLearnerStudyAnalyticsEnabled()
+    setUpTestApplicationComponent(enableLearnerStudyAnalytics = true)
     logTwoEvents()
 
     runSynchronously { analyticsController.uploadEventLogsAndWait() }
@@ -1058,7 +1058,7 @@ class AnalyticsControllerTest {
   @Test
   fun testController_uploadEventLogsAndWait_withLogs_studyOn_setsSyncStatusToUploadingUploaded() {
     // Sync statuses only make sense in the context of the learner study feature being enabled.
-    setUpTestApplicationComponentWithLearnerStudyAnalyticsEnabled()
+    setUpTestApplicationComponent(enableLearnerStudyAnalytics = true)
     logTwoEventsOffline()
 
     runSynchronously { analyticsController.uploadEventLogsAndWait() }
@@ -1071,7 +1071,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_uploadEventLogsAndWait_withLogs_studyOff_removesEventsButDoesNotTrackThem() {
-    setUpTestApplicationComponent()
+    setUpTestApplicationComponent(enableLearnerStudyAnalytics = false)
     logTwoEventsOffline()
 
     runSynchronously { analyticsController.uploadEventLogsAndWait() }
@@ -1085,7 +1085,7 @@ class AnalyticsControllerTest {
 
   @Test
   fun testController_uploadEventLogsAndWait_withLogs_studyOn_removesEventsForUploading() {
-    setUpTestApplicationComponentWithLearnerStudyAnalyticsEnabled()
+    setUpTestApplicationComponent(enableLearnerStudyAnalytics = true)
     logTwoEventsOffline()
 
     runSynchronously { analyticsController.uploadEventLogsAndWait() }
@@ -1148,13 +1148,8 @@ class AnalyticsControllerTest {
     assertThat(fakeAnalyticsEventLogger.getEventListCount()).isEqualTo(3)
   }
 
-  private fun setUpTestApplicationComponent() {
-    TestPlatformParameterModule.forceEnableLearnerStudyAnalytics(false)
-    ApplicationProvider.getApplicationContext<TestApplication>().inject(this)
-  }
-
-  private fun setUpTestApplicationComponentWithLearnerStudyAnalyticsEnabled() {
-    TestPlatformParameterModule.forceEnableLearnerStudyAnalytics(true)
+  private fun setUpTestApplicationComponent(enableLearnerStudyAnalytics: Boolean = false) {
+    TestPlatformParameterModule.forceEnableLearnerStudyAnalytics(enableLearnerStudyAnalytics)
     ApplicationProvider.getApplicationContext<TestApplication>().inject(this)
   }
 
diff --git a/domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/BUILD.bazel b/domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/BUILD.bazel
index 0f60989eacb..da6cd042dea 100644
--- a/domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/BUILD.bazel
+++ b/domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/BUILD.bazel
@@ -55,6 +55,7 @@ oppia_android_test(
         "//testing",
         "//testing/src/main/java/org/oppia/android/testing/logging:sync_status_test_module",
         "//testing/src/main/java/org/oppia/android/testing/logging:test_sync_status_manager",
+        "//testing/src/main/java/org/oppia/android/testing/platformparameter:test_module",
         "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module",
         "//testing/src/main/java/org/oppia/android/testing/threading:test_module",
         "//testing/src/main/java/org/oppia/android/testing/time:test_module",
diff --git a/domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/LogUploadWorkerTest.kt b/domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/LogUploadWorkerTest.kt
index dc1c9c5e976..4f4b2a1ca65 100644
--- a/domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/LogUploadWorkerTest.kt
+++ b/domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/LogUploadWorkerTest.kt
@@ -19,7 +19,6 @@ import dagger.BindsInstance
 import dagger.Component
 import dagger.Module
 import dagger.Provides
-import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.Mockito.`when`
@@ -37,7 +36,6 @@ import org.oppia.android.domain.oppialogger.analytics.AnalyticsController
 import org.oppia.android.domain.oppialogger.analytics.ApplicationLifecycleModule
 import org.oppia.android.domain.oppialogger.analytics.PerformanceMetricsController
 import org.oppia.android.domain.oppialogger.exceptions.ExceptionsController
-import org.oppia.android.domain.platformparameter.PlatformParameterModule
 import org.oppia.android.domain.platformparameter.PlatformParameterSingletonModule
 import org.oppia.android.domain.testing.oppialogger.loguploader.FakeLogUploader
 import org.oppia.android.testing.FakeAnalyticsEventLogger
@@ -47,6 +45,7 @@ import org.oppia.android.testing.data.DataProviderTestMonitor
 import org.oppia.android.testing.logging.SyncStatusTestModule
 import org.oppia.android.testing.logging.TestSyncStatusManager
 import org.oppia.android.testing.mockito.anyOrNull
+import org.oppia.android.testing.platformparameter.TestPlatformParameterModule
 import org.oppia.android.testing.robolectric.RobolectricModule
 import org.oppia.android.testing.threading.TestCoroutineDispatchers
 import org.oppia.android.testing.threading.TestDispatcherModule
@@ -129,19 +128,9 @@ class LogUploadWorkerTest {
 
   private val exception = Exception("TEST")
 
-  @Before
-  fun setUp() {
-    setUpTestApplicationComponent()
-    context = InstrumentationRegistry.getInstrumentation().targetContext
-    val config = Configuration.Builder()
-      .setExecutor(SynchronousExecutor())
-      .setWorkerFactory(logUploadWorkerFactory)
-      .build()
-    WorkManagerTestInitHelper.initializeTestWorkManager(context, config)
-  }
-
   @Test
   fun testWorker_logEvent_withoutNetwork_enqueueRequest_verifyFailed() {
+    setUpTestApplicationComponent()
     networkConnectionUtil.setCurrentConnectionStatus(NONE)
     analyticsController.logImportantEvent(
       oppiaLogger.createOpenInfoTabContext(TEST_TOPIC_ID),
@@ -172,6 +161,7 @@ class LogUploadWorkerTest {
 
   @Test
   fun testWorker_logEvent_withNetwork_enqueueRequest_verifySuccess() {
+    setUpTestApplicationComponent()
     networkConnectionUtil.setCurrentConnectionStatus(NONE)
     analyticsController.logImportantEvent(
       oppiaLogger.createOpenInfoTabContext(TEST_TOPIC_ID),
@@ -202,6 +192,7 @@ class LogUploadWorkerTest {
 
   @Test
   fun testWorker_logEvent_withoutNetwork_enqueueRequest_writeFails_verifyFailure() {
+    setUpTestApplicationComponent()
     networkConnectionUtil.setCurrentConnectionStatus(NONE)
     analyticsController.logImportantEvent(
       oppiaLogger.createOpenInfoTabContext(TEST_TOPIC_ID),
@@ -232,6 +223,7 @@ class LogUploadWorkerTest {
 
   @Test
   fun testWorker_logException_withoutNetwork_enqueueRequest_verifySuccess() {
+    setUpTestApplicationComponent()
     networkConnectionUtil.setCurrentConnectionStatus(NONE)
     exceptionsController.logNonFatalException(exception, TEST_TIMESTAMP)
     testCoroutineDispatchers.runCurrent()
@@ -263,6 +255,7 @@ class LogUploadWorkerTest {
 
   @Test
   fun testWorker_logPerformanceMetric_withoutNetwork_enqueueRequest_verifySuccess() {
+    setUpTestApplicationComponent()
     networkConnectionUtil.setCurrentConnectionStatus(NONE)
     performanceMetricsController.logPerformanceMetricsEvent(
       TEST_TIMESTAMP,
@@ -303,7 +296,8 @@ class LogUploadWorkerTest {
   }
 
   @Test
-  fun testWorker_logEvent_withNetwork_enqueueRequest_verifySyncStatusesHasSuccess() {
+  fun testWorker_logEvent_withNetwork_enqueueRequest_studyOn_verifySyncStatusesHasSuccess() {
+    setUpTestApplicationComponent(enableLearnerStudyAnalytics = true)
     networkConnectionUtil.setCurrentConnectionStatus(NONE)
     analyticsController.logImportantEvent(
       oppiaLogger.createOpenInfoTabContext(TEST_TOPIC_ID),
@@ -337,7 +331,8 @@ class LogUploadWorkerTest {
   }
 
   @Test
-  fun testWorker_logEvent_withoutNetwork_enqueueRequest_verifySyncStatusesHasFailed() {
+  fun testWorker_logEvent_withoutNetwork_enqueueRequest_studyOn_verifySyncStatusesHasFailed() {
+    setUpTestApplicationComponent(enableLearnerStudyAnalytics = true)
     networkConnectionUtil.setCurrentConnectionStatus(NONE)
     analyticsController.logImportantEvent(
       oppiaLogger.createOpenInfoTabContext(TEST_TOPIC_ID),
@@ -372,7 +367,8 @@ class LogUploadWorkerTest {
   }
 
   @Test
-  fun testWorker_logEvent_withoutNetwork_enqueueRequest_writeFails_verifySyncStatusesHasFailed() {
+  fun testWorker_logEvent_noNetwork_enqueueRequest_writeFails_studyOn_verifyHasFailedSyncStatus() {
+    setUpTestApplicationComponent(enableLearnerStudyAnalytics = true)
     networkConnectionUtil.setCurrentConnectionStatus(NONE)
     analyticsController.logImportantEvent(
       oppiaLogger.createOpenInfoTabContext(TEST_TOPIC_ID),
@@ -421,8 +417,15 @@ class LogUploadWorkerTest {
   private fun Array<StackTraceElement>.extractRelevantDetails(): List<List<Any>> =
     map { elem -> listOf(elem.fileName, elem.methodName, elem.lineNumber, elem.className) }
 
-  private fun setUpTestApplicationComponent() {
+  private fun setUpTestApplicationComponent(enableLearnerStudyAnalytics: Boolean = false) {
+    TestPlatformParameterModule.forceEnableLearnerStudyAnalytics(enableLearnerStudyAnalytics)
     ApplicationProvider.getApplicationContext<TestApplication>().inject(this)
+    context = InstrumentationRegistry.getInstrumentation().targetContext
+    val config = Configuration.Builder()
+      .setExecutor(SynchronousExecutor())
+      .setWorkerFactory(logUploadWorkerFactory)
+      .build()
+    WorkManagerTestInitHelper.initializeTestWorkManager(context, config)
   }
 
   @Qualifier
@@ -492,10 +495,10 @@ class LogUploadWorkerTest {
       TestDispatcherModule::class, LogReportWorkerModule::class,
       TestFirebaseLogUploaderModule::class, FakeOppiaClockModule::class,
       NetworkConnectionUtilDebugModule::class, LocaleProdModule::class, LoggerModule::class,
-      AssetModule::class, PlatformParameterModule::class, PlatformParameterSingletonModule::class,
-      LoggingIdentifierModule::class, SyncStatusTestModule::class,
-      PerformanceMetricsAssessorModule::class, ApplicationLifecycleModule::class,
-      PerformanceMetricsConfigurationsModule::class
+      AssetModule::class, TestPlatformParameterModule::class,
+      PlatformParameterSingletonModule::class, LoggingIdentifierModule::class,
+      SyncStatusTestModule::class, PerformanceMetricsAssessorModule::class,
+      ApplicationLifecycleModule::class, PerformanceMetricsConfigurationsModule::class
     ]
   )
   interface TestApplicationComponent : DataProvidersInjector {

From 136504a77ddf5fda2038f7cc53ec63b4146eef6c Mon Sep 17 00:00:00 2001
From: Ben Henning <ben@oppia.org>
Date: Fri, 10 Mar 2023 01:11:41 -0800
Subject: [PATCH 36/38] Revert unnecessary change.

---
 .../org/oppia/android/app/application/alphakenya/BUILD.bazel    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/oppia/android/app/application/alphakenya/BUILD.bazel b/app/src/main/java/org/oppia/android/app/application/alphakenya/BUILD.bazel
index cdc840c6d63..538d47308dc 100644
--- a/app/src/main/java/org/oppia/android/app/application/alphakenya/BUILD.bazel
+++ b/app/src/main/java/org/oppia/android/app/application/alphakenya/BUILD.bazel
@@ -21,7 +21,7 @@ kt_android_library(
         "//app/src/main/java/org/oppia/android/app/application:common_application_modules",
         "//app/src/main/java/org/oppia/android/app/application/alpha:alpha_build_flavor_module",
         "//utility/src/main/java/org/oppia/android/util/logging:kenya_alpha_event_logging_configuration_module",
-        "//utility/src/main/java/org/oppia/android/util/logging/firebase:debug_module",
+        "//utility/src/main/java/org/oppia/android/util/logging/firebase:prod_module",
         "//utility/src/main/java/org/oppia/android/util/networking:prod_module",
     ],
 )

From 1d046499b8a6bdbb3df89a08ce33cf355258bd9c Mon Sep 17 00:00:00 2001
From: Ben Henning <ben@oppia.org>
Date: Fri, 10 Mar 2023 13:01:07 -0800
Subject: [PATCH 37/38] Gradle test build fix.

---
 utility/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/utility/build.gradle b/utility/build.gradle
index 4ffcde26c70..4af0a029e0e 100644
--- a/utility/build.gradle
+++ b/utility/build.gradle
@@ -109,6 +109,7 @@ dependencies {
       'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.2.2',
       'org.mockito:mockito-core:2.19.0',
       'org.robolectric:robolectric:4.5',
+      project(":data"),
       project(":testing"),
   )
   kapt(

From d0eedea9a5a316d1cdb07a9efb2bd599bd41446e Mon Sep 17 00:00:00 2001
From: Ben Henning <ben@oppia.org>
Date: Fri, 10 Mar 2023 13:37:41 -0800
Subject: [PATCH 38/38] Address reviewer comments.

---
 .../ControlButtonsViewModel.kt                | 14 ++++--
 .../ProfileLearnerIdItemViewModel.kt          | 50 +++++++++++--------
 .../layout/profile_list_learner_id_item.xml   | 16 +++---
 .../analytics/AnalyticsController.kt          |  6 +--
 4 files changed, 51 insertions(+), 35 deletions(-)

diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ControlButtonsViewModel.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ControlButtonsViewModel.kt
index 50426c3628f..9cb185bcac4 100644
--- a/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ControlButtonsViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ControlButtonsViewModel.kt
@@ -57,7 +57,7 @@ class ControlButtonsViewModel private constructor(
         is DeviceIdItemViewModel -> listOf("Oppia app installation ID: ${viewModel.deviceId.value}")
         is ProfileLearnerIdItemViewModel -> {
           val profile = viewModel.profile
-          val stats = viewModel.uploadEventsStats.value
+          val stats = viewModel.profileSpecificEventsUploadStats.value
           val learnerStats = stats?.learnerStats
           val uncategorizedStats = stats?.uncategorizedStats
           listOfNotNull(
@@ -178,11 +178,16 @@ class ControlButtonsViewModel private constructor(
    * operation, but there may have been events to upload in the past.
    *
    * @property eventsUploaded the number of events that have uploaded so far
-   * @property totalEventsToUpload the total number of events to upload, or none
+   * @property totalEventsToUpload the total number of events to upload, or none, or
+   *     [DEFAULT_UNKNOWN_EVENTS_TO_UPLOAD_COUNT] if it's not yet known how many events can be
+   *     uploaded
    */
-  data class ForceSyncProgress(val eventsUploaded: Int = 0, val totalEventsToUpload: Int = -1) {
+  data class ForceSyncProgress(
+    val eventsUploaded: Int = 0,
+    val totalEventsToUpload: Int = DEFAULT_UNKNOWN_EVENTS_TO_UPLOAD_COUNT
+  ) {
     /** Returns whether there are events that can be uploaded. */
-    fun hasEventsToUpload(): Boolean = totalEventsToUpload != -1
+    fun hasEventsToUpload(): Boolean = totalEventsToUpload != DEFAULT_UNKNOWN_EVENTS_TO_UPLOAD_COUNT
 
     /** Returns whether there are events currently being uploaded. */
     fun isCurrentlyUploading(): Boolean = eventsUploaded < totalEventsToUpload
@@ -205,6 +210,7 @@ class ControlButtonsViewModel private constructor(
 
   private companion object {
     private const val BASE64_LINE_WRAP_LIMIT = 80
+    private const val DEFAULT_UNKNOWN_EVENTS_TO_UPLOAD_COUNT = Integer.MIN_VALUE
 
     // Copied from ProtoStringEncoder (which isn't available in production code).
     private fun <M : MessageLite> M.toCompressedBase64(): String {
diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileLearnerIdItemViewModel.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileLearnerIdItemViewModel.kt
index db8106e05f6..d5fe581ba87 100644
--- a/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileLearnerIdItemViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileLearnerIdItemViewModel.kt
@@ -42,8 +42,11 @@ class ProfileLearnerIdItemViewModel private constructor(
     analyticsController.getEventLogStore().toLiveData()
   }
 
-  /** The current [UploadEventsStats] that represent the current profile's event upload stats. */
-  val uploadEventsStats: LiveData<UploadEventsStats> by lazy {
+  /**
+   * The current [ProfileSpecificEventsUploadStats] that represent the current profile's event
+   * upload stats.
+   */
+  val profileSpecificEventsUploadStats: LiveData<ProfileSpecificEventsUploadStats> by lazy {
     Transformations.map(oppiaEventLogs, this::processEventLogs)
   }
 
@@ -94,7 +97,7 @@ class ProfileLearnerIdItemViewModel private constructor(
    * @property uncategorizedStats the stats corresponding to events not tied to an individual
    *     profile, nor ``null`` if these aren't computed for this user
    */
-  data class UploadEventsStats(
+  data class ProfileSpecificEventsUploadStats(
     val learnerStats: CategorizedEventStats,
     val uncategorizedStats: CategorizedEventStats?
   ) {
@@ -103,8 +106,8 @@ class ProfileLearnerIdItemViewModel private constructor(
 
     companion object {
       /**
-       * Returns a new [UploadEventsStats] with event stats retrieved from [oppiaEventLogs] for the
-       * specified [profile] (and localized per [resourceHandler]).
+       * Returns a new [ProfileSpecificEventsUploadStats] with event stats retrieved from
+       * [oppiaEventLogs] for the specified [profile] (and localized per [resourceHandler]).
        *
        * Note that only admin profiles will include [uncategorizedStats] in the returned stats
        * object.
@@ -113,10 +116,10 @@ class ProfileLearnerIdItemViewModel private constructor(
         resourceHandler: AppLanguageResourceHandler,
         profile: Profile,
         oppiaEventLogs: OppiaEventLogs
-      ): UploadEventsStats {
+      ): ProfileSpecificEventsUploadStats {
         val logsToUploadMap = oppiaEventLogs.eventLogsToUploadList.associateByProfileId()
         val uploadedLogsMap = oppiaEventLogs.uploadedEventLogsList.associateByProfileId()
-        return UploadEventsStats(
+        return ProfileSpecificEventsUploadStats(
           learnerStats = CategorizedEventStats.createFrom(
             resourceHandler, profile.id, logsToUploadMap, uploadedLogsMap
           ),
@@ -130,13 +133,15 @@ class ProfileLearnerIdItemViewModel private constructor(
       }
 
       /**
-       * Returns a new [UploadEventsStats] with unknown event counts filled in (localized per
-       * [resourceHandler]).
+       * Returns a new [ProfileSpecificEventsUploadStats] with unknown event counts filled in
+       * (localized per [resourceHandler]).
        */
-      fun createFromUnknown(resourceHandler: AppLanguageResourceHandler): UploadEventsStats {
+      fun createFromUnknown(
+        resourceHandler: AppLanguageResourceHandler
+      ): ProfileSpecificEventsUploadStats {
         val unknownCountText =
           resourceHandler.getStringInLocale(R.string.learner_analytics_unknown_event_count)
-        return UploadEventsStats(
+        return ProfileSpecificEventsUploadStats(
           learnerStats = CategorizedEventStats(
             awaitingUploadEventCountText = unknownCountText,
             uploadedEventCountText = unknownCountText
@@ -198,16 +203,21 @@ class ProfileLearnerIdItemViewModel private constructor(
     } else null
   }
 
-  private fun processEventLogs(result: AsyncResult<OppiaEventLogs>): UploadEventsStats {
+  private fun processEventLogs(
+    result: AsyncResult<OppiaEventLogs>
+  ): ProfileSpecificEventsUploadStats {
     return when (result) {
-      is AsyncResult.Pending -> UploadEventsStats.createFromUnknown(resourceHandler)
-      is AsyncResult.Success -> UploadEventsStats.createFrom(resourceHandler, profile, result.value)
-      is AsyncResult.Failure -> UploadEventsStats.createFromUnknown(resourceHandler).also {
-        oppiaLogger.e(
-          "ProfileLearnerIdItemViewModel",
-          "Encountered unexpected failure when processing event logs",
-          result.error
-        )
+      is AsyncResult.Pending -> ProfileSpecificEventsUploadStats.createFromUnknown(resourceHandler)
+      is AsyncResult.Success ->
+        ProfileSpecificEventsUploadStats.createFrom(resourceHandler, profile, result.value)
+      is AsyncResult.Failure -> {
+        ProfileSpecificEventsUploadStats.createFromUnknown(resourceHandler).also {
+          oppiaLogger.e(
+            "ProfileLearnerIdItemViewModel",
+            "Encountered unexpected failure when processing event logs",
+            result.error
+          )
+        }
       }
     }
   }
diff --git a/app/src/main/res/layout/profile_list_learner_id_item.xml b/app/src/main/res/layout/profile_list_learner_id_item.xml
index 619b4b8961f..5f7750b4592 100644
--- a/app/src/main/res/layout/profile_list_learner_id_item.xml
+++ b/app/src/main/res/layout/profile_list_learner_id_item.xml
@@ -104,7 +104,7 @@
       android:layout_height="wrap_content"
       android:layout_marginTop="16dp"
       android:layout_marginEnd="16dp"
-      android:text="@{viewModel.uploadEventsStats.learnerStats.awaitingUploadEventCountText}"
+      android:text="@{viewModel.profileSpecificEventsUploadStats.learnerStats.awaitingUploadEventCountText}"
       android:textColor="@color/component_color_profile_and_device_id_activity_primary_text_color"
       android:textSize="12sp"
       app:layout_constraintBottom_toTopOf="@+id/learner_events_awaiting_upload_text_barrier"
@@ -135,7 +135,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_margin="16dp"
-      android:text="@{viewModel.uploadEventsStats.learnerStats.uploadedEventCountText}"
+      android:text="@{viewModel.profileSpecificEventsUploadStats.learnerStats.uploadedEventCountText}"
       android:textColor="@color/component_color_profile_and_device_id_activity_primary_text_color"
       android:textSize="12sp"
       app:layout_constraintBottom_toTopOf="@+id/learner_events_uploaded_text_barrier"
@@ -158,7 +158,7 @@
       android:text="@string/learner_analytics_uncategorized_events_waiting_upload"
       android:textColor="@color/component_color_profile_and_device_id_activity_primary_text_color"
       android:textSize="12sp"
-      android:visibility="@{viewModel.uploadEventsStats.hasUncategorizedStats() ? View.VISIBLE : View.GONE, default=gone}"
+      android:visibility="@{viewModel.profileSpecificEventsUploadStats.hasUncategorizedStats() ? View.VISIBLE : View.GONE, default=gone}"
       app:layout_constraintBottom_toTopOf="@+id/uncategorized_events_awaiting_upload_text_barrier"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toBottomOf="@+id/learner_events_uploaded_text_barrier" />
@@ -169,10 +169,10 @@
       android:layout_height="wrap_content"
       android:layout_marginTop="16dp"
       android:layout_marginEnd="16dp"
-      android:text="@{viewModel.uploadEventsStats.uncategorizedStats.awaitingUploadEventCountText}"
+      android:text="@{viewModel.profileSpecificEventsUploadStats.uncategorizedStats.awaitingUploadEventCountText}"
       android:textColor="@color/component_color_profile_and_device_id_activity_primary_text_color"
       android:textSize="12sp"
-      android:visibility="@{viewModel.uploadEventsStats.hasUncategorizedStats() ? View.VISIBLE : View.GONE, default=gone}"
+      android:visibility="@{viewModel.profileSpecificEventsUploadStats.hasUncategorizedStats() ? View.VISIBLE : View.GONE, default=gone}"
       app:layout_constraintBottom_toTopOf="@+id/uncategorized_events_awaiting_upload_text_barrier"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintTop_toBottomOf="@+id/learner_events_uploaded_text_barrier" />
@@ -192,7 +192,7 @@
       android:text="@string/learner_analytics_uncategorized_events_uploaded"
       android:textColor="@color/component_color_profile_and_device_id_activity_primary_text_color"
       android:textSize="12sp"
-      android:visibility="@{viewModel.uploadEventsStats.hasUncategorizedStats() ? View.VISIBLE : View.GONE, default=gone}"
+      android:visibility="@{viewModel.profileSpecificEventsUploadStats.hasUncategorizedStats() ? View.VISIBLE : View.GONE, default=gone}"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toBottomOf="@+id/uncategorized_events_awaiting_upload_text_barrier" />
@@ -202,10 +202,10 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_margin="16dp"
-      android:text="@{viewModel.uploadEventsStats.uncategorizedStats.uploadedEventCountText}"
+      android:text="@{viewModel.profileSpecificEventsUploadStats.uncategorizedStats.uploadedEventCountText}"
       android:textColor="@color/component_color_profile_and_device_id_activity_primary_text_color"
       android:textSize="12sp"
-      android:visibility="@{viewModel.uploadEventsStats.hasUncategorizedStats() ? View.VISIBLE : View.GONE, default=gone}"
+      android:visibility="@{viewModel.profileSpecificEventsUploadStats.hasUncategorizedStats() ? View.VISIBLE : View.GONE, default=gone}"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintTop_toBottomOf="@+id/uncategorized_events_awaiting_upload_text_barrier" />
diff --git a/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsController.kt b/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsController.kt
index bb8bcf6c4b8..383252ee7d7 100644
--- a/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsController.kt
+++ b/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsController.kt
@@ -65,9 +65,9 @@ class AnalyticsController @Inject constructor(
   @EnableLearnerStudyAnalytics private val enableLearnerStudyParam: PlatformParameterValue<Boolean>
 ) {
   // NOTE TO DEVELOPER: This log store should not be lazy since it needs to be primed as early as
-  // possible. When this is created shouldn't affect event record integrity, but it can affect how
-  // the sync status manager reports progress since it won't have a data source to properly monitor
-  // for changes.
+  // possible. Creating the log store with a delay (such as would happen if it were lazy delegated)
+  // shouldn't affect event record integrity, but it can affect how the sync status manager reports
+  // progress since it won't have a data source to properly monitor for changes.
   private val eventLogStore =
     cacheStoreFactory.create("event_logs", OppiaEventLogs.getDefaultInstance()).also { store ->
       store.primeInMemoryAndDiskCacheAsync(