Brandon Li 218b1cc69c HDFS-5330. Merging change r1532539 from trunk 11 lat temu
..
main 218b1cc69c HDFS-5330. Merging change r1532539 from trunk 11 lat temu
test 218b1cc69c HDFS-5330. Merging change r1532539 from trunk 11 lat temu