diff --git a/libwvdrmengine/cdm/core/include/cdm_engine.h b/libwvdrmengine/cdm/core/include/cdm_engine.h
index ba46985e..dbedeca3 100644
--- a/libwvdrmengine/cdm/core/include/cdm_engine.h
+++ b/libwvdrmengine/cdm/core/include/cdm_engine.h
@@ -348,9 +348,8 @@ class CdmEngine {
   }
   virtual const std::string& GetAppPackageName() { return app_package_name_; }
   virtual void SetSpoid(const std::string& spoid) { spoid_ = spoid; }
-  virtual CdmResponseType SetPlaybackId(
-      const CdmSessionId& session_id,
-      const std::string& playback_id);
+  virtual CdmResponseType SetPlaybackId(const CdmSessionId& session_id,
+                                        const std::string& playback_id);
 
  protected:
   friend class CdmEngineFactory;
diff --git a/libwvdrmengine/cdm/core/src/cdm_engine.cpp b/libwvdrmengine/cdm/core/src/cdm_engine.cpp
index 0bd5420a..2a71f0d2 100644
--- a/libwvdrmengine/cdm/core/src/cdm_engine.cpp
+++ b/libwvdrmengine/cdm/core/src/cdm_engine.cpp
@@ -1922,10 +1922,10 @@ CdmResponseType CdmEngine::ValidateServiceCertificate(const std::string& cert) {
   return certificate.Init(cert);
 }
 
-CdmResponseType CdmEngine::SetPlaybackId(
-    const CdmSessionId& session_id, const std::string& playback_id) {
-  LOGI("Setting session_id = %s playback_id = %s",
-       session_id.c_str(), playback_id.c_str());
+CdmResponseType CdmEngine::SetPlaybackId(const CdmSessionId& session_id,
+                                         const std::string& playback_id) {
+  LOGI("Setting session_id = %s playback_id = %s", session_id.c_str(),
+       playback_id.c_str());
   std::shared_ptr<CdmSession> session;
   if (!session_map_.FindSession(session_id, &session)) {
     LOGE("Session ID not found: %s", session_id.c_str());
diff --git a/libwvdrmengine/cdm/include/wv_content_decryption_module.h b/libwvdrmengine/cdm/include/wv_content_decryption_module.h
index ca375027..68a14978 100644
--- a/libwvdrmengine/cdm/include/wv_content_decryption_module.h
+++ b/libwvdrmengine/cdm/include/wv_content_decryption_module.h
@@ -180,9 +180,8 @@ class WvContentDecryptionModule : public android::RefBase, public TimerHandler {
                                                CdmSecurityLevel security_level,
                                                const CdmIdentifier& identifier);
 
-  virtual CdmResponseType SetPlaybackId(
-      const CdmSessionId& session_id,
-      const std::string& playback_id);
+  virtual CdmResponseType SetPlaybackId(const CdmSessionId& session_id,
+                                        const std::string& playback_id);
 
  private:
   struct CdmInfo {
diff --git a/libwvdrmengine/cdm/metrics/src/metrics_collections.cpp b/libwvdrmengine/cdm/metrics/src/metrics_collections.cpp
index f799910c..c2152052 100644
--- a/libwvdrmengine/cdm/metrics/src/metrics_collections.cpp
+++ b/libwvdrmengine/cdm/metrics/src/metrics_collections.cpp
@@ -246,8 +246,7 @@ void SessionMetrics::SerializeSessionMetrics(
       license_sdk_version_.ToProto());
   session_metrics->set_allocated_license_service_version(
       license_service_version_.ToProto());
-  session_metrics->set_allocated_playback_id(
-      playback_id_.ToProto());
+  session_metrics->set_allocated_playback_id(playback_id_.ToProto());
 }
 
 OemCryptoDynamicAdapterMetrics::OemCryptoDynamicAdapterMetrics()
diff --git a/libwvdrmengine/cdm/src/wv_content_decryption_module.cpp b/libwvdrmengine/cdm/src/wv_content_decryption_module.cpp
index 8e7b30ae..4033a64c 100644
--- a/libwvdrmengine/cdm/src/wv_content_decryption_module.cpp
+++ b/libwvdrmengine/cdm/src/wv_content_decryption_module.cpp
@@ -610,10 +610,9 @@ CdmResponseType WvContentDecryptionModule::RemoveOfflineLicense(
 }
 
 CdmResponseType WvContentDecryptionModule::SetPlaybackId(
-    const CdmSessionId& session_id,
-    const std::string& playback_id) {
-  LOGV("Setting session ID %s playback ID %s",
-       session_id.c_str(), playback_id.c_str());
+    const CdmSessionId& session_id, const std::string& playback_id) {
+  LOGV("Setting session ID %s playback ID %s", session_id.c_str(),
+       playback_id.c_str());
   CdmEngine* cdm_engine = GetCdmForSessionId(session_id);
   if (!cdm_engine) return SESSION_NOT_FOUND_23;
   return cdm_engine->SetPlaybackId(session_id, playback_id);