Merge "Move wait_for_interface_status to waiters"