df4e59318f
Only Prod Changes: Test already cherry-picked as part of HDFS-16310 via (496657c63fc504dfeef47a3da56214800575367b)