diff --git a/hadoop-build-tools/src/main/resources/checkstyle/checkstyle.xml b/hadoop-build-tools/src/main/resources/checkstyle/checkstyle.xml
index 74faa48413e..3aaf17669f9 100644
--- a/hadoop-build-tools/src/main/resources/checkstyle/checkstyle.xml
+++ b/hadoop-build-tools/src/main/resources/checkstyle/checkstyle.xml
@@ -158,6 +158,7 @@
         <module name="EqualsHashCode"/>
         <module name="HiddenField">
           <property name="ignoreConstructorParameter" value="true"/>
+          <property name="ignoreSetter" value="true"/>
         </module>
         <module name="IllegalInstantiation"/>
         <module name="InnerAssignment"/>
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 401df941fa1..f8e033dc3d0 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -698,6 +698,8 @@ Release 2.9.0 - UNRELEASED
     HADOOP-10321. TestCompositeService should cover all enumerations of 
     adding a service to a parent service. (Ray Chiang via kasha)
 
+    HADOOP-12859. Disable hiding field style checks in class setters. (Kai Zheng via wang)
+
   BUG FIXES
 
     HADOOP-12605. Fix intermittent failure of TestIPC.testIpcWithReaderQueuing