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