Merge "Change the hashtree hash algorithm to sha256"