[automerger skipped] [DO NOT MERGE] Fix heap buffer overflow for releaseSecureStops. am: 2587ab6c76 -s ours am: 63a3347443 am: 94ac050b2f am: ef164e4437 -s ours am: 121c5ae252 -s ours
am skip reason: subject contains skip directive

Change-Id: I5d4790ac55e418ab557193355bf95c9a8459297f