Merge "Fixed total breakage of HashRing in 9d1cd9a."