[automerger skipped] [DO NOT MERGE] Fix heap buffer overflow for releaseSecureStops. am: 2587ab6c76 -s ours am: 63a3347443 am: 94ac050b2f

Change-Id: I9ccc0ffb6075461b8ce2567cdf464e29ba9f0c1f