Merge "Fix flaky idmap test"