[automerger skipped] [DO NOT MERGE] Fix heap buffer overflow for releaseSecureStops. am: b92e3bf778 -s ours am: e66902ca77

Change-Id: Iaa0cca2e621f0018edd7bad0da2dd06cb33cc974