Source release 16.2.0

metrics/include/metrics_collections.h

@@ -172,6 +172,11 @@ class CryptoMetrics {
   EventMetric<kErrorCodeFieldNumber, CdmResponseType>
       usage_table_header_update_entry_;
   ValueMetric<size_t> usage_table_header_initial_size_;
+  /* UsageTableHeader - LRU */
+  ValueMetric<size_t> usage_table_header_lru_usage_info_count_;
+  ValueMetric<size_t> usage_table_header_lru_offline_license_count_;
+  ValueMetric<int64_t> usage_table_header_lru_evicted_entry_staleness_;
+  ValueMetric<int> usage_table_header_lru_evicted_entry_type_;
   /* OEMCRYPTO */
   ValueMetric<uint32_t> oemcrypto_api_version_;
   CounterMetric<kOemCryptoResultFieldNumber, OEMCryptoResult>
@@ -274,6 +279,20 @@ class CryptoMetrics {
   CounterMetric<kOemCryptoResultFieldNumber, OEMCryptoResult>
       oemcrypto_set_decrypt_hash_;
   ValueMetric<uint32_t> oemcrypto_resource_rating_tier_;
+  EventMetric<kOemCryptoResultFieldNumber, OEMCryptoResult>
+      oemcrypto_prep_and_sign_license_request_;
+  EventMetric<kOemCryptoResultFieldNumber, OEMCryptoResult>
+      oemcrypto_prep_and_sign_renewal_request_;
+  EventMetric<kOemCryptoResultFieldNumber, OEMCryptoResult>
+      oemcrypto_prep_and_sign_provisioning_request_;
+  EventMetric<kOemCryptoResultFieldNumber, OEMCryptoResult>
+      oemcrypto_load_license_;
+  EventMetric<kOemCryptoResultFieldNumber, OEMCryptoResult>
+      oemcrypto_load_renewal_;
+  EventMetric<kOemCryptoResultFieldNumber, OEMCryptoResult>
+      oemcrypto_load_provisioning_;
+  ValueMetric<uint32_t> oemcrypto_minor_api_version_;
+  ValueMetric<uint32_t> oemcrypto_maximum_usage_table_header_size_;
 };
 
 // This class contains session-scoped metrics. All properties and

metrics/include/value_metric.h

@@ -100,7 +100,7 @@ class ValueMetric {
       return value_proto;
     }
 
-    return NULL;
+    return nullptr;
   }
 
  private: