Merge "Fixing test failure on hwasan builds"