gd: Port of previous scn security update

Fix memory overflow.

Code moved preventing proper application.

Bug: 180939982
Test: gd/cert/run
Tag: #refactor

Merged-In: 1be3b836e09901c9cc614b02e21ae41b9a1ebfac
Change-Id: 1be3b836e09901c9cc614b02e21ae41b9a1ebfac
(cherry picked from commit
 8d9eb989)

Change-Id: I8490bca9e8c902ce61404d34b87a0e53fae104ab