Merge "Add wait_for_interface and wait_for_service."