Merge "Fix InstanceIdentifier toString()"