Merge "attach_interfaces as smoke"