Merge "memset_s based on capacity rather than size" am: a9ea31e93c am: 7f0e7cdda6
am: abca16356a

Change-Id: Ie8ca48252f670a3c5040d0c09afa827c79a01dff