diff --git a/libwvdrmengine/oemcrypto/include/OEMCryptoCENC.h b/libwvdrmengine/oemcrypto/include/OEMCryptoCENC.h
index 670e5ab3..fd410044 100644
--- a/libwvdrmengine/oemcrypto/include/OEMCryptoCENC.h
+++ b/libwvdrmengine/oemcrypto/include/OEMCryptoCENC.h
@@ -2116,7 +2116,7 @@ OEMCryptoResult OEMCrypto_QueryKeyControl(OEMCrypto_SESSION session,
  * 256 bits it will be used for OEMCrypto_Generic_Sign() or
  * OEMCrypto_Generic_Verify() as specified in the key control block. If the key
  * will be used for OEMCrypto_Generic_Encrypt() or OEMCrypto_Generic_Decrypt()
- * then the cipher mode will always be OEMCrypto_CipherMode_CBC. Continue to
+ * then the cipher mode will always be OEMCrypto_CipherMode_CBCS. Continue to
  * use this key for this session until OEMCrypto_SelectKey() is called again,
  * or until OEMCrypto_CloseSession() is called.
  *
@@ -2292,15 +2292,15 @@ OEMCryptoResult OEMCrypto_SelectKey(OEMCrypto_SESSION session,
  * 'cbcs'. Starting with v16, OEMCrypto only supports 'cenc' and 'cbcs'. The
  * schemes 'cens' and 'cbc1' are not supported.
  *
- * The decryption mode, either OEMCrypto_CipherMode_CTR or
- * OEMCrypto_CipherMode_CBC, was already specified in the call to
+ * The decryption mode, either OEMCrypto_CipherMode_CENC or
+ * OEMCrypto_CipherMode_CBCS, was already specified in the call to
  * OEMCrypto_SelectKey(). The encryption pattern is specified by the fields in
  * the parameter pattern. A description of partial encryption patterns for
  * 'cbcs' can be found in the ISO-CENC standard, section 10.4.
  *
  * 'cenc' SCHEME:
  *
- * The 'cenc' scheme is OEMCrypto_CipherMode_CTR without an encryption
+ * The 'cenc' scheme is OEMCrypto_CipherMode_CENC without an encryption
  * pattern. All the bytes in the encrypted portion of each subsample are
  * encrypted. In the pattern parameter, both the encrypt and skip fields will
  * be zero.
@@ -2323,7 +2323,7 @@ OEMCryptoResult OEMCrypto_SelectKey(OEMCrypto_SESSION session,
  *
  * 'cbcs' SCHEME:
  *
- * The 'cbcs' scheme is OEMCrypto_CipherMode_CBC with an encryption pattern.
+ * The 'cbcs' scheme is OEMCrypto_CipherMode_CBCS with an encryption pattern.
  * Only some of the bytes in the encrypted portion of each subsample are
  * encrypted. In the pattern parameter, the encrypt and skip fields will
  * usually be non-zero. This mode allows devices to decrypt FMP4 HLS content,
diff --git a/libwvdrmengine/oemcrypto/include/OEMCryptoCENCCommon.h b/libwvdrmengine/oemcrypto/include/OEMCryptoCENCCommon.h
index cc0c0720..dd929640 120000
--- a/libwvdrmengine/oemcrypto/include/OEMCryptoCENCCommon.h
+++ b/libwvdrmengine/oemcrypto/include/OEMCryptoCENCCommon.h
@@ -1 +1 @@
-../odk/include/OEMCryptoCENCCommon.h
\ No newline at end of file
+../../oemcrypto/odk/include/OEMCryptoCENCCommon.h
\ No newline at end of file
diff --git a/libwvdrmengine/oemcrypto/odk/include/core_message_features.h b/libwvdrmengine/oemcrypto/odk/include/core_message_features.h
index 16289c6b..07113e6e 100644
--- a/libwvdrmengine/oemcrypto/odk/include/core_message_features.h
+++ b/libwvdrmengine/oemcrypto/odk/include/core_message_features.h
@@ -30,13 +30,13 @@ struct CoreMessageFeatures {
   uint32_t maximum_major_version = 17;
   uint32_t maximum_minor_version = 0;
 
-  bool operator==(const CoreMessageFeatures &other) const;
-  bool operator!=(const CoreMessageFeatures &other) const {
+  bool operator==(const CoreMessageFeatures& other) const;
+  bool operator!=(const CoreMessageFeatures& other) const {
     return !(*this == other);
   }
 };
 
-std::ostream &operator<<(std::ostream &os, const CoreMessageFeatures &features);
+std::ostream& operator<<(std::ostream& os, const CoreMessageFeatures& features);
 
 }  // namespace features
 }  // namespace oemcrypto_core_message
diff --git a/libwvdrmengine/oemcrypto/odk/include/odk_message.h b/libwvdrmengine/oemcrypto/odk/include/odk_message.h
index 94ce2ae7..e4f135f6 100644
--- a/libwvdrmengine/oemcrypto/odk/include/odk_message.h
+++ b/libwvdrmengine/oemcrypto/odk/include/odk_message.h
@@ -35,10 +35,10 @@ extern "C" {
  */
 
 #if defined(__GNUC__) || defined(__clang__)
-#define ALIGNED __attribute__((aligned))
+#  define ALIGNED __attribute__((aligned))
 #else
-#define ALIGNED
-#error ODK_Message must be aligned to the maximum useful alignment of the \
+#  define ALIGNED
+#  error ODK_Message must be aligned to the maximum useful alignment of the \
   machine you are compiling for. Define the ALIGNED macro accordingly.
 #endif
 
diff --git a/libwvdrmengine/oemcrypto/odk/include/odk_structs.h b/libwvdrmengine/oemcrypto/odk/include/odk_structs.h
index a3ae63b2..72be13bd 100644
--- a/libwvdrmengine/oemcrypto/odk/include/odk_structs.h
+++ b/libwvdrmengine/oemcrypto/odk/include/odk_structs.h
@@ -19,7 +19,7 @@ extern "C" {
 #define ODK_MINOR_VERSION 0
 
 /* ODK Version string. Date changed automatically on each release. */
-#define ODK_RELEASE_DATE "ODK v17.0 2022-01-24"
+#define ODK_RELEASE_DATE "ODK v17.0 2022-02-15"
 
 /* The lowest version number for an ODK message. */
 #define ODK_FIRST_VERSION 16
diff --git a/libwvdrmengine/oemcrypto/odk/src/core_message_features.cpp b/libwvdrmengine/oemcrypto/odk/src/core_message_features.cpp
index c28622c0..9dbbecbd 100644
--- a/libwvdrmengine/oemcrypto/odk/src/core_message_features.cpp
+++ b/libwvdrmengine/oemcrypto/odk/src/core_message_features.cpp
@@ -8,7 +8,7 @@ namespace oemcrypto_core_message {
 namespace features {
 const CoreMessageFeatures CoreMessageFeatures::kDefaultFeatures;
 
-bool CoreMessageFeatures::operator==(const CoreMessageFeatures &other) const {
+bool CoreMessageFeatures::operator==(const CoreMessageFeatures& other) const {
   return maximum_major_version == other.maximum_major_version &&
          maximum_minor_version == other.maximum_minor_version;
 }
@@ -31,8 +31,8 @@ CoreMessageFeatures CoreMessageFeatures::DefaultFeatures(
   return features;
 }
 
-std::ostream &operator<<(std::ostream &os,
-                         const CoreMessageFeatures &features) {
+std::ostream& operator<<(std::ostream& os,
+                         const CoreMessageFeatures& features) {
   return os << "v" << features.maximum_major_version << "."
             << features.maximum_minor_version;
 }