Index: libcxx/include/__config
===================================================================
--- libcxx/include/__config
+++ libcxx/include/__config
@@ -1444,6 +1444,13 @@
 #  define _LIBCPP_PACKED_BYTE_FOR_AIX_END  /* empty */
 #endif
 
+// Used to allow Google to transition to std::string_view while cleaning up
+// code that constructs it from `nullptr` -- which is undefined.
+// TODO(EricWF) Remove me!
+#ifndef _LIBCPP_CHAR_TRAITS_LENGTH_HOOK
+#  define _LIBCPP_CHAR_TRAITS_LENGTH_HOOK(_TraitsType, __str) _TraitsType::length(__str)
+#endif
+
 #endif // __cplusplus
 
 #endif // _LIBCPP_CONFIG
Index: libcxx/include/__string
===================================================================
--- libcxx/include/__string
+++ libcxx/include/__string
@@ -559,17 +559,6 @@
 }
 #endif // _LIBCPP_HAS_NO_WIDE_CHARACTERS
 
-template <class _Traits>
-_LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-inline size_t __char_traits_length_checked(const typename _Traits::char_type* __s) _NOEXCEPT {
-#if _LIBCPP_DEBUG_LEVEL >= 1
-  return __s ? _Traits::length(__s) : (_VSTD::__libcpp_debug_function(_VSTD::__libcpp_debug_info(__FILE__, __LINE__, "p == nullptr", "null pointer pass to non-null argument of char_traits<...>::length")), 0);
-#else
-  return _Traits::length(__s);
-#endif
-}
-
 #ifndef _LIBCPP_HAS_NO_CHAR8_T
 
 template <>
Index: libcxx/include/string_view
===================================================================
--- libcxx/include/string_view
+++ libcxx/include/string_view
@@ -317,7 +317,7 @@
 
     _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
     basic_string_view(const _CharT* __s)
-        : __data(__s), __size(_VSTD::__char_traits_length_checked<_Traits>(__s)) {}
+        : __data(__s), __size(_LIBCPP_CHAR_TRAITS_LENGTH_HOOK(_Traits, __s)) {}
 
 #if _LIBCPP_STD_VER > 20
     basic_string_view(nullptr_t) = delete;