diff --git a/.gitignore b/.gitignore
index 97370295f..473ae13aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,6 +73,7 @@
 /third_party/gflags/src
 /third_party/google-visualization-python
 /third_party/icu
+/third_party/instrumented_libraries
 /third_party/jsoncpp
 /third_party/jsr-305
 /third_party/junit
diff --git a/setup_links.py b/setup_links.py
index a72565e4d..a0fd6e566 100755
--- a/setup_links.py
+++ b/setup_links.py
@@ -43,6 +43,7 @@ DIRECTORIES = [
   'third_party/drmemory',
   'third_party/expat',
   'third_party/icu',
+  'third_party/instrumented_libraries',
   'third_party/jsoncpp',
   'third_party/libc++',
   'third_party/libc++abi',
diff --git a/tools/msan/OWNERS b/tools/msan/OWNERS
new file mode 100644
index 000000000..72e8ffc0d
--- /dev/null
+++ b/tools/msan/OWNERS
@@ -0,0 +1 @@
+*
diff --git a/tools/msan/blacklist.txt b/tools/msan/blacklist.txt
new file mode 100644
index 000000000..3c9c9b202
--- /dev/null
+++ b/tools/msan/blacklist.txt
@@ -0,0 +1,12 @@
+# The rules in this file are only applied at compile time.
+# Because the Chrome buildsystem does not automatically touch the files
+# mentioned here, changing this file requires clobbering all MSan bots.
+#
+# Please think twice before you add or remove these rules.
+
+# This is a stripped down copy of Chromium's blacklist.txt, to enable
+# adding WebRTC-specific blacklist entries.
+
+# Uninit in zlib. http://crbug.com/116277
+fun:*MOZ_Z_deflate*
+