Merge "Merge "Fixing how SIDs are added to keys during generation time" into rvc-dev am: 1149789b am: f7693a5c" into rvc-d1-dev-plus-aosp