Merge "Prefer InstanceIdentifier imports"