Merge "Fix flaky test ClatdStartStop in CuttleFish"