Merge "Fix remove_uidiface_info failing on first entry"