Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Update Gerrit API to 2.16.20

Change-Id: I22ae00b586a8dd77c905b5bb159c9c9b7fcd4f93
diff --git a/gerrit_api.bzl b/gerrit_api.bzl
index 8987b4e..14b694f 100644
--- a/gerrit_api.bzl
+++ b/gerrit_api.bzl
@@ -6,7 +6,7 @@
 gerrit_api is rule for fetching Gerrit plugin API using Bazel.
 """
 
-VER = "3.0.9"
+VER = "3.1.5"
 
 def gerrit_api():
     bouncycastle_repos()
@@ -15,12 +15,12 @@
     maven_jar(
         name = "gerrit_plugin_api",
         artifact = "com.google.gerrit:gerrit-plugin-api:" + VER,
-        sha1 = "dbcadf2c198b1ee1b74678855e8e10b2c403de1f",
+        sha1 = "9e260775db2e6b9785289abcb9631baf587c2fa6",
     )
     maven_jar(
         name = "gerrit_acceptance_framework",
         artifact = "com.google.gerrit:gerrit-acceptance-framework:" + VER,
-        sha1 = "799cb104f2c0de4394528e38ad487557dd69bb49",
+        sha1 = "1fd18acc64bfe45f0a05e6e0b4d518c140099222",
     )
     native.bind(
         name = "gerrit-plugin-api",
diff --git a/gerrit_api_maven_local.bzl b/gerrit_api_maven_local.bzl
index bdeb4ba..aa9b50b 100644
--- a/gerrit_api_maven_local.bzl
+++ b/gerrit_api_maven_local.bzl
@@ -6,7 +6,7 @@
 gerrit_api is rule for fetching Gerrit plugin API using Bazel.
 """
 
-VER = "3.0.2-SNAPSHOT"
+VER = "3.1.3-SNAPSHOT"
 
 def gerrit_api_maven_local():
     bouncycastle_repos()