Merge "Fix various not so benign fdsan errors."