Merge "Fixing how SIDs are added to keys during generation time" into rvc-dev am: 1149789b am: f7693a5c Change-Id: I871b650d668de712a227d9c4dc2c582613c7b0c0