Brandon Li 992a046b89 HDFS-5069. Merging change r1516232 from trunk 11 years ago
..
main 992a046b89 HDFS-5069. Merging change r1516232 from trunk 11 years ago