Merge "Rename isValidSubtypeId() to isValidSubtypeHashCode()" into main