Merge "Fixing how SIDs are added to keys during generation time" into rvc-dev am: 1149789be5

Change-Id: I406e958372dda849a40d4995588a37ebc5968057