diff --git a/libwvdrmengine/cdm/include/UniquePtr.h b/libwvdrmengine/cdm/include/UniquePtr.h
index 62558c3f..a5cd794d 100644
--- a/libwvdrmengine/cdm/include/UniquePtr.h
+++ b/libwvdrmengine/cdm/include/UniquePtr.h
@@ -1,7 +1,5 @@
 /*
- * Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
- * source code may only be used and distributed under the Widevine Master
- * License Agreement.
+ * Copyright (C) 2010 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/libwvdrmengine/src_hidl/WVCreatePluginFactories.cpp b/libwvdrmengine/src_hidl/WVCreatePluginFactories.cpp
index a4da8d7b..8815ab05 100644
--- a/libwvdrmengine/src_hidl/WVCreatePluginFactories.cpp
+++ b/libwvdrmengine/src_hidl/WVCreatePluginFactories.cpp
@@ -1,5 +1,7 @@
 //
-// Copyright 2017 Google Inc. All Rights Reserved.
+// Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
+// source code may only be used and distributed under the Widevine Master
+// License Agreement.
 //
 
 #include "WVCreatePluginFactories.h"
diff --git a/libwvdrmengine/src_hidl/WVCryptoFactory.cpp b/libwvdrmengine/src_hidl/WVCryptoFactory.cpp
index a98bd3e2..2aebc4c3 100644
--- a/libwvdrmengine/src_hidl/WVCryptoFactory.cpp
+++ b/libwvdrmengine/src_hidl/WVCryptoFactory.cpp
@@ -1,5 +1,7 @@
 //
-// Copyright 2017 Google Inc. All Rights Reserved.
+// Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
+// source code may only be used and distributed under the Widevine Master
+// License Agreement.
 //
 
 //#define LOG_NDEBUG 0
diff --git a/libwvdrmengine/src_hidl/WVDrmFactory.cpp b/libwvdrmengine/src_hidl/WVDrmFactory.cpp
index a93d294d..d41374d9 100644
--- a/libwvdrmengine/src_hidl/WVDrmFactory.cpp
+++ b/libwvdrmengine/src_hidl/WVDrmFactory.cpp
@@ -1,5 +1,7 @@
 //
-// Copyright 2017 Google Inc. All Rights Reserved.
+// Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
+// source code may only be used and distributed under the Widevine Master
+// License Agreement.
 //
 
 //#define LOG_NDEBUG 0
diff --git a/libwvdrmengine/vts/vendor_module/factory.cpp b/libwvdrmengine/vts/vendor_module/factory.cpp
index 0ed3684d..d1c76e9d 100644
--- a/libwvdrmengine/vts/vendor_module/factory.cpp
+++ b/libwvdrmengine/vts/vendor_module/factory.cpp
@@ -24,5 +24,3 @@ namespace widevine_vts {
         }
     };
 }; // namespace widevine_vts
-
-
diff --git a/libwvdrmengine/vts/vendor_module/vts_module.cpp b/libwvdrmengine/vts/vendor_module/vts_module.cpp
index 205abb67..a5a4d8af 100644
--- a/libwvdrmengine/vts/vendor_module/vts_module.cpp
+++ b/libwvdrmengine/vts/vendor_module/vts_module.cpp
@@ -1,5 +1,7 @@
 //
-// Copyright 2017 Google Inc. All Rights Reserved.
+// Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
+// source code may only be used and distributed under the Widevine Master
+// License Agreement.
 //
 #include "gtest/gtest.h"
 #include "license_request.h"
@@ -158,5 +160,3 @@ namespace widevine_vts {
     }
 
 }; // namespace widevine_vts
-
-
diff --git a/libwvdrmengine/vts/vendor_module/vts_module.h b/libwvdrmengine/vts/vendor_module/vts_module.h
index 8d18d800..d3c87cfc 100644
--- a/libwvdrmengine/vts/vendor_module/vts_module.h
+++ b/libwvdrmengine/vts/vendor_module/vts_module.h
@@ -1,5 +1,7 @@
 //
-// Copyright 2017 Google Inc. All Rights Reserved.
+// Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
+// source code may only be used and distributed under the Widevine Master
+// License Agreement.
 //
 #ifndef WIDEVINE_VENDOR_VTS_MODULE
 #define WIDEVINE_VENDOR_VTS_MODULE