Merge "Fix two asan failures"