Merge "Explicitly set generate_hashtree: false"