Merge "Fix fdsan check"