diff --git a/core/src/main/java/io/grpc/NameResolver.java b/core/src/main/java/io/grpc/NameResolver.java
index c8e17b6919..c38512faeb 100644
--- a/core/src/main/java/io/grpc/NameResolver.java
+++ b/core/src/main/java/io/grpc/NameResolver.java
@@ -307,6 +307,8 @@ public abstract class NameResolver {
       }
 
       /**
+       * Returns config if exists, otherwise null.
+       *
        * @since 1.20.0
        */
       @Nullable
@@ -315,6 +317,8 @@ public abstract class NameResolver {
       }
 
       /**
+       * Returns error status if exists, otherwise null.
+       *
        * @since 1.20.0
        */
       @Nullable
diff --git a/grpclb/src/test/java/io/grpc/grpclb/GrpclbLoadBalancerTest.java b/grpclb/src/test/java/io/grpc/grpclb/GrpclbLoadBalancerTest.java
index 1f066193dd..8999f2a120 100644
--- a/grpclb/src/test/java/io/grpc/grpclb/GrpclbLoadBalancerTest.java
+++ b/grpclb/src/test/java/io/grpc/grpclb/GrpclbLoadBalancerTest.java
@@ -1391,7 +1391,6 @@ public class GrpclbLoadBalancerTest {
 
   @Test
   public void grpclbFallback_noBalancerAddress() {
-    long loadReportIntervalMillis = 1983;
     InOrder inOrder = inOrder(helper, subchannelPool);
 
     // Create a resolution list with just backend addresses
diff --git a/java_grpc_library.bzl b/java_grpc_library.bzl
index ff8abd422a..98f91a3222 100644
--- a/java_grpc_library.bzl
+++ b/java_grpc_library.bzl
@@ -1,3 +1,5 @@
+"""Build rule for java_grpc_library."""
+
 load("@bazel_tools//tools/jdk:toolchain_utils.bzl", "find_java_runtime_toolchain", "find_java_toolchain")
 
 # "repository" here is for Bazel builds that span multiple WORKSPACES.