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
Change-Id: I659675a921a596f2360004b3d6b90c47909e32e1