Brandon Li 5195a62139 HDFS-5107. Merging change r1515218 from branch-2 12 lat temu
..
main 5195a62139 HDFS-5107. Merging change r1515218 from branch-2 12 lat temu
test ca51771197 HDFS-4962. Merging r1509386 from branch-2 12 lat temu