Merge "Remove redundant NULL checks on calls to memset_s."