diff --git a/sdk/android/src/jni/pc/java_native_conversion.cc b/sdk/android/src/jni/pc/java_native_conversion.cc
index 3f0e2e1e1b..db4f785ec1 100644
--- a/sdk/android/src/jni/pc/java_native_conversion.cc
+++ b/sdk/android/src/jni/pc/java_native_conversion.cc
@@ -505,7 +505,7 @@ void JavaToNativeRtpParameters(JNIEnv* jni,
     if (!IsNull(jni, j_ssrc)) {
       jlong ssrc_value = jni->CallLongMethod(j_ssrc, long_value_id);
       CHECK_EXCEPTION(jni) << "error during CallLongMethod";
-      encoding.ssrc = rtc::Optional<uint32_t>(ssrc_value);
+      encoding.ssrc = ssrc_value;
     }
     parameters->encodings.push_back(encoding);
   }
diff --git a/sdk/android/src/jni/pc/peerconnectionfactory_jni.cc b/sdk/android/src/jni/pc/peerconnectionfactory_jni.cc
index 5882243e2e..fdae2f0550 100644
--- a/sdk/android/src/jni/pc/peerconnectionfactory_jni.cc
+++ b/sdk/android/src/jni/pc/peerconnectionfactory_jni.cc
@@ -418,7 +418,7 @@ JNI_FUNCTION_DECLARATION(jlong,
   if (key_type != rtc::KT_DEFAULT) {
     rtc::scoped_refptr<rtc::RTCCertificate> certificate =
         rtc::RTCCertificateGenerator::GenerateCertificate(
-            rtc::KeyParams(key_type), rtc::Optional<uint64_t>());
+            rtc::KeyParams(key_type), rtc::nullopt);
     if (!certificate) {
       RTC_LOG(LS_ERROR) << "Failed to generate certificate. KeyType: "
                         << key_type;