[automerger skipped] [DO NOT MERGE] Fix heap buffer overflow for releaseSecureStops. am: fa237c4f76 am: c1e8596b5d -s ours
am skip reason: subject contains skip directive

Change-Id: I69e777ada34e05b31bf0d2113b819b9cd3e1b33b