Brandon Li 6f7be784bd HDFS-5136. Merging change r1519229 from branch-2 12 lat temu
..
main 6f7be784bd HDFS-5136. Merging change r1519229 from branch-2 12 lat temu
test 6f7be784bd HDFS-5136. Merging change r1519229 from branch-2 12 lat temu