Merge "Remove dependency on base::Hash"