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: 8e322629 am: f2de10e5
Change-Id: I8fe38703451b95861bf8158c3692089a30fe362e