Merge "Fix AttachInterfacesTest error"