[automerger skipped] [DO NOT MERGE] Fix heap buffer overflow for releaseSecureStops. am: b92e3bf778 -s ours
am skip reason: skipped by user edwinwong

Change-Id: I873220bc26a3a88177e072842a63ad170c0ee023