Brandon Li 5e0bc1ee85 HDFS-6439. Merging change r1603622 from trunk 11 lat temu
..
main 5e0bc1ee85 HDFS-6439. Merging change r1603622 from trunk 11 lat temu
test 5e0bc1ee85 HDFS-6439. Merging change r1603622 from trunk 11 lat temu