Merge "Track removal of String hash functions."