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

Change-Id: I0ecc5ca49831231c9f3a07ba8076d02ea9583057