diff --git a/absl/base/config.h b/absl/base/config.h
index c768e7223b93f1a334d001f456458e2a807dbfab..875d8e4fbada3d554dde19678fd2e2f184e79100 100644
--- a/absl/base/config.h
+++ b/absl/base/config.h
@@ -162,9 +162,9 @@
 #error ABSL_HAVE_THREAD_LOCAL cannot be directly set
 #elif !defined(__apple_build_version__) ||   \
     ((__apple_build_version__ >= 8000042) && \
-     !(TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_8_0))
+     !(TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_9_0))
 // Notes: Xcode's clang did not support `thread_local` until version
-// 8, and even then not for iOS < 8.0.
+// 8, and even then not for all iOS < 9.0.
 #define ABSL_HAVE_THREAD_LOCAL 1
 #endif
 
diff --git a/absl/strings/string_view.h b/absl/strings/string_view.h
index 5dd08b3a56277629cf89838e3432a454728d6546..033509ada239f9d4fa369aa8c4ade0d6fe9fb513 100644
--- a/absl/strings/string_view.h
+++ b/absl/strings/string_view.h
@@ -482,21 +482,21 @@ class string_view {
   static constexpr size_type kMaxSize =
       std::numeric_limits<size_type>::max() / 2 + 1;
 
-  static constexpr size_type StrLenInternal(const char* str) {
-    return str ?
-// check whether __builtin_strlen is provided by the compiler.
-// GCC doesn't have __has_builtin()
-// (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66970),
-// but has __builtin_strlen according to
-// https://gcc.gnu.org/onlinedocs/gcc-4.7.0/gcc/Other-Builtins.html.
+  // check whether __builtin_strlen is provided by the compiler.
+  // GCC doesn't have __has_builtin()
+  // (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66970),
+  // but has __builtin_strlen according to
+  // https://gcc.gnu.org/onlinedocs/gcc-4.7.0/gcc/Other-Builtins.html.
 #if ABSL_HAVE_BUILTIN(__builtin_strlen) || \
     (defined(__GNUC__) && !defined(__clang__))
-               __builtin_strlen(str)
+  static constexpr size_type StrLenInternal(const char* str) {
+    return str ? __builtin_strlen(str) : 0;
+  }
 #else
-               strlen(str)
-#endif
-               : 0;
+  static constexpr size_type StrLenInternal(const char* str) {
+    return str ? strlen(str) : 0;
   }
+#endif
 
   static constexpr size_type CheckLengthInternal(size_type len) {
     return ABSL_ASSERT(len <= kMaxSize), len;
diff --git a/absl/synchronization/BUILD.bazel b/absl/synchronization/BUILD.bazel
index 7efc67e67638ee879df813e14a06e805d4423f06..cc8cecf979913f62aa7665def90f60407c0e8b26 100644
--- a/absl/synchronization/BUILD.bazel
+++ b/absl/synchronization/BUILD.bazel
@@ -129,7 +129,6 @@ cc_library(
 cc_test(
     name = "mutex_test",
     size = "large",
-    timeout = "moderate",
     srcs = ["mutex_test.cc"],
     copts = ABSL_TEST_COPTS,
     tags = [