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

Change-Id: Ia0c1259a0e5e61c2ba4063e5d210e55f8a114adf