diff --git a/Android.bp b/Android.bp
index 63f2244..d422eb2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -31,4 +31,10 @@
             exclude_srcs: ["src/main/**/PathConverter.java"],
         },
     },
+
+    errorprone: {
+        javacflags: [
+            "-Xep:CollectionIncompatibleType:WARN",  // b/74215153
+        ],
+    }
 }
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..2608f15
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,18 @@
+name: "jcommander"
+description: "JCommander is a very small Java framework that makes it trivial to parse command line parameters."
+third_party {
+  url {
+    type: HOMEPAGE
+    value: "http://jcommander.org/"
+  }
+  url {
+    type: GIT
+    value: "https://github.com/cbeust/jcommander.git"
+  }
+  version: "14fbe2bc5a2c402b456ed68578a5d5dc2c343fa2"
+  last_upgrade_date {
+    year: 2016
+    month: 3
+    day: 16
+  }
+}