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 am: 6359c054
Change-Id: Iedddf53050c6b4386a4818b168ed62b6aa7067b2