Merge "Fix reply check in SingleStepTest."