Merge "Improve InstanceIdentifier.keyOf()"