Merge "Fix CHA test failures under some configurations."