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

Change-Id: Ib5a57249b540e8f5aa1164f822dac463ee4b0904