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

Change-Id: I9db1fe8e6b843fc5b8cb6b82ce2924e1b7219919