Merge "Move wait_for_interface_status from service client"