Merge "Fix flaky XfrmControllerTest."