Merge "Fix flaky test." into klp-modular-dev