Merge "Update IidFactoryTest to use non-deprecated function"