diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index 2bb6739..97d68b2 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,5 +1,5 @@
 {
   "git": {
-    "sha1": "09619bc3a85243f092e68ab9ba1f2c5573d5a85b"
+    "sha1": "1e5368c80fd4272ada7d2ed7c6be783376bb5080"
   }
 }
diff --git a/Android.bp b/Android.bp
index 412db99..620d9f7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,7 +1,27 @@
 // This file is generated by cargo2android.py --run --dependencies --tests.
 
+package {
+    default_applicable_licenses: [
+        "external_rust_crates_protobuf-codegen_license",
+    ],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+    name: "external_rust_crates_protobuf-codegen_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-MIT",
+    ],
+    license_text: [
+        "LICENSE.txt",
+    ],
+}
+
 rust_library_host {
     name: "libprotobuf_codegen",
+    // has rustc warnings
     crate_name: "protobuf_codegen",
     srcs: ["src/lib.rs"],
     edition: "2015",
@@ -12,6 +32,7 @@
 
 rust_test_host {
     name: "protobuf-codegen_host_test_src_lib",
+    // has rustc warnings
     crate_name: "protobuf_codegen",
     srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
@@ -24,6 +45,7 @@
 
 rust_binary_host {
     name: "protoc-gen-rust",
+    // has rustc warnings
     crate_name: "protoc_gen_rust",
     srcs: ["src/bin/protoc-gen-rust.rs"],
     edition: "2015",
@@ -34,4 +56,4 @@
 }
 
 // dependent_library ["feature_list"]
-//   protobuf-2.18.1
+//   protobuf-2.20.0
diff --git a/Cargo.lock b/Cargo.lock
index f5d8ba8..900a439 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,13 +2,13 @@
 # It is not intended for manual editing.
 [[package]]
 name = "protobuf"
-version = "2.18.1"
+version = "2.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da78e04bc0e40f36df43ecc6575e4f4b180e8156c4efd73f13d5619479b05696"
+checksum = "86473d5f16580f10b131a0bf0afb68f8e029d1835d33a00f37281b05694e5312"
 
 [[package]]
 name = "protobuf-codegen"
-version = "2.18.1"
+version = "2.20.0"
 dependencies = [
  "protobuf",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index abfda3b..3159edc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,7 @@
 
 [package]
 name = "protobuf-codegen"
-version = "2.18.1"
+version = "2.20.0"
 authors = ["Stepan Koltsov <stepan.koltsov@gmail.com>"]
 description = "Code generator for rust-protobuf.\n\nIncludes a library and `protoc-gen-rust` binary.\n\nSee `protoc-rust` and `protobuf-codegen-pure` crates.\n"
 homepage = "https://github.com/stepancheg/rust-protobuf/"
@@ -34,4 +34,4 @@
 path = "src/bin/protobuf-bin-gen-rust-do-not-use.rs"
 test = false
 [dependencies.protobuf]
-version = "=2.18.1"
+version = "=2.20.0"
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index 4124067..1f02fd0 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,6 +1,6 @@
 [package]
 name = "protobuf-codegen"
-version = "2.18.1"
+version = "2.20.0"
 authors = ["Stepan Koltsov <stepan.koltsov@gmail.com>"]
 license = "MIT"
 homepage = "https://github.com/stepancheg/rust-protobuf/"
@@ -17,7 +17,7 @@
 bench = false
 
 [dependencies]
-protobuf = { path = "../protobuf", version = "=2.18.1" }
+protobuf = { path = "../protobuf", version = "=2.20.0" }
 
 [[bin]]
 
diff --git a/METADATA b/METADATA
index a3beffb..5a52570 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@
   }
   url {
     type: ARCHIVE
-    value: "https://static.crates.io/crates/protobuf-codegen/protobuf-codegen-2.18.1.crate"
+    value: "https://static.crates.io/crates/protobuf-codegen/protobuf-codegen-2.20.0.crate"
   }
-  version: "2.18.1"
+  version: "2.20.0"
   license_type: NOTICE
   last_upgrade_date {
-    year: 2020
-    month: 11
-    day: 24
+    year: 2021
+    month: 1
+    day: 7
   }
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
deleted file mode 100644
index fe12edb..0000000
--- a/TEST_MAPPING
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated by cargo2android.py for tests in Android.bp
-{
-  "presubmit": [
-    {
-      "host": true,
-      "name": "protobuf-codegen_host_test_src_lib"
-    }
-  ]
-}
diff --git a/src/lib.rs b/src/lib.rs
index 8011bc1..859fa5e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -144,7 +144,7 @@
         ),
         |w| {
             w.write_line(&format!(
-                "{}::parse_from_bytes(file_descriptor_proto_data).unwrap()",
+                "{}::Message::parse_from_bytes(file_descriptor_proto_data).unwrap()",
                 protobuf_crate_path(customize)
             ));
         },
@@ -192,7 +192,7 @@
     {
         let mut w = CodeWriter::new(&mut v);
 
-        w.write_generated_by("rust-protobuf", "2.18.1");
+        w.write_generated_by("rust-protobuf", "2.20.0");
         w.write_line(&format!("//! Generated file from `{}`", file.get_name()));
         if customize.inside_protobuf != Some(true) {
             w.write_line("");