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

Change-Id: I4d096a3b1c35a2aa1d14deac9f36d2665450e06e