Merge "Update java doc for FLAG_DIR_BLOCKS_TREE"