Merge "Fix heap buffer overflow for releaseSecureStops."