Merge "Fix ASAN build error"