[DO NOT MERGE] Fix heap buffer overflow for releaseSecureStops. am: fa237c4f76

Change-Id: If5a392a28c53986f4c1bf69004b1bb83186382f0