[automerger skipped] [DO NOT MERGE] Fix heap buffer overflow for releaseSecureStops. am: b92e3bf778 -s ours am: e66902ca77 am: 620ad68efe -s ours am: 95bbffc779 -s ours
am skip reason: subject contains skip directive

Change-Id: I9fdce00d60b4d02148db919fcd34f9e86476ba4f