Merge "Remove unnecessary getComparableKey from HashMapBinding"