Merge "Fixing how SIDs are added to keys during generation time" into rvc-dev...
Merge "Fixing how SIDs are added to keys during generation time" into rvc-dev am: 1149789b am: f7693a5c am: a1a88329 am: e63d0908 am: 9894328f
Change-Id: Ie940b9a4a0572a86ee2f6935c69a1f8438a7cd31