Brandon Li b8391fc397 HDFS-6378. Merging change r1610545 from branch-2 11 lat temu
..
main b8391fc397 HDFS-6378. Merging change r1610545 from branch-2 11 lat temu
test 5e0bc1ee85 HDFS-6439. Merging change r1603622 from trunk 11 lat temu