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

Change-Id: Icc795af2019c3a48969adbe861da1b07fb18cfda