Merge "memset_s based on capacity rather than size"